The present disclosure provides a hot water storage tank support system and a water heater pan. In one implementation, the hot water tank support system comprises a water heat pan having a bottom wall, an outer wall extending upwardly from and substantially surrounding the bottom wall, and at least one elevated support feature, and at least one substantially rigid supplemental support component. The at least one elevated support feature is configured to support the hot water storage tank, and the at least one elevated support feature includes at least one supplemental support cavity configured to receive the at least one supplemental support component. In some implementations, the supplemental support component(s) may be insertable and removable from the water heater pan.