Leaking Water Heater in San Rafael: Replace Now or Wait for 2028?
A 17-year-old gas tank in a San Rafael garage started leaking this spring. Here's what we did, what to do if yours leaks, and how the delayed 2028 Air District rule changes your options.

A puddle under the water heater is one of the most common calls we get in San Rafael, and this year it comes with a second question: should I replace it with gas now, or is there a rule I need to worry about? Short answer: if your gas tank is leaking from the tank itself, it needs replacing, and a new gas tank can still be installed. If you have water on the garage floor right now, call or text Local Plumbing at (415) 234-0370.
Here's a real job from this spring, what to do in the first ten minutes, and how the Air District's delayed 2028 rule fits in.
A Real San Rafael Job: 17 Years, Then a Puddle
In April 2026 we got a call from a home in central San Rafael with water spreading across the garage floor. Our technician found a 17-year-old, 40-gallon "short" natural gas water heater actively leaking and heavily rusted at the base.
What we did:
- Made it safe first. He shut off the water and the gas to the heater, and the leak stopped.
- Checked where the water was coming from. Rust and water from the tank body itself means the steel tank has failed. That can't be patched.
- Replaced it like for like. We installed a new American Standard 40-gallon short gas water heater, the low-profile size that fits where a standard tall tank won't.
- Added a thermal expansion tank. The old heater had none. Without one, pressure builds every time the heater fires, which is hard on the relief valve, fittings and the tank itself.
- Recommended a drain pan with a line to the outside. A pan piped to the exterior sends the next leak outside instead of across the garage floor. It wasn't part of this job, but it's worth adding with any garage install.
The homeowner kept gas because it was the fastest, lowest-cost fix and the existing gas line and flue were already in place. That's still a reasonable choice in late 2026.
What to Do in the First 10 Minutes
If your water heater is leaking:
- Shut off the cold water at the valve on the pipe going into the top of the heater.
- Turn the gas control to "Off" (or "Pilot" on older models). If you smell gas, leave the house and call PG&E from outside.
- Keep stored items off the floor and put a bucket or towels under the drip.
- Don't open the drain valve unless you know the tank has cooled. The water inside can be scalding.
- Take a photo of the label (brand, model, serial number). It tells us the age and size before we arrive.
Leak From a Fitting, or From the Tank?
Not every puddle means a new heater. Before we talk replacement, we find the source:
- Fittings, flex lines or the drain valve: usually repairable.
- Relief valve dripping or discharging: often a pressure problem, like a missing or failed expansion tank. Fix the cause, not just the valve.
- Water from under the jacket, rust at the base, or a wet burner area: the tank has failed. Replace it.
As a rule of thumb, a heater under about 8 to 10 years old with one failed part is usually worth repairing. A 15- or 17-year-old tank with rust at the base is not.
Why Garage Water Heaters in San Rafael Leak the Way They Do
Much of San Rafael's housing went up between the 1940s and 1970s, from Sun Valley and Glenwood to Peacock Gap and the tracts in Terra Linda. Many of those homes keep the water heater in the garage, often on a platform, sometimes squeezed under a shelf or stairs. That's why short tanks are common here.
Garage installs from earlier decades often lack things a modern install includes: a thermal expansion tank, a drain pan, proper seismic strapping, and a relief line that ends somewhere safe. When a tank that old fails, the replacement is a good time to bring the whole setup up to code. In low-lying parts of east San Rafael, a gas heater whose controls have sat in floodwater should stay off until it's checked.
Gas, Heat Pump or Tankless: Does the 2028 Rule Change Anything?
On November 4, 2026, the Bay Area Air District delayed its zero-NOx rule for home gas water heaters by one year. Here's what it means for a leaking heater in San Rafael:
- Through 2027, a new gas tank can still be installed. The zero-NOx requirement applies to gas tanks over 30 gallons (up to 75,000 BTU/hr) manufactured after January 1, 2028.
- Your working heater can stay. The rule only applies when a heater is sold or installed. Repairs are allowed.
- Gas tankless and boilers have a later date: units manufactured after January 1, 2033.
- If a gas tank fails after 2027, a licensed contractor can install a temporary gas replacement for up to 12 months with an Air District certificate while a compliant option is arranged. Other exemptions exist, but the Air District decides who qualifies.
Full details are in our 2028 rule update and our Air District rule guide.
So what should you choose?
- Gas tank: the fastest and lowest-cost replacement, often the same day. A good fit when the old tank failed without warning. Plan on it being your last gas tank.
- Heat pump water heater: all-electric and where the rules are heading. It needs space for air, a condensate drain and electrical capacity, so it isn't always a same-day swap. MCE currently offers up to $3,000 ($5,000 for ultra-low-GWP models) through a participating contractor, applied for before the install.
- Gas tankless: endless hot water and a later 2033 date, but most conversions need a bigger gas line and new venting.
If your heater is leaking today, a gas tank is a sensible choice. If it's old but still dry, now is the time to plan a heat pump on your own schedule instead of during an emergency.
What It Costs in San Rafael
A gas tank water heater replacement in San Rafael typically runs $3,500 to $6,500 installed. Access, venting, gas line sizing and code items the old install never had move the price. Heat pump water heaters run $6,500 to $12,000 before rebates, and tankless is priced on site. Every estimate is free and in writing before any work starts. See our San Rafael water heater replacement page for options and recent jobs.
Leaking Water Heater FAQs
Can a leaking water heater be repaired?
If the leak is from a fitting, flex line, drain valve or relief valve, usually yes. If water is coming from the tank body or there's rust at the base, the tank has failed and needs replacing.
Can I still replace my gas water heater with gas in San Rafael?
Yes. Gas tank water heaters can still be installed through 2027. The Air District's zero-NOx rule applies to tanks manufactured after January 1, 2028.
Is a leaking water heater dangerous?
The water itself is mostly a damage risk, but turn off the gas or power and the cold water supply right away. If you smell gas, leave the house and call PG&E.
How long does a water heater last in Marin?
Most gas tanks last about 10 to 15 years. Marin's soft water is gentle on tanks, but a missing expansion tank or a worn-out anode rod can shorten that.
Water Heater Help in San Rafael
We're based in San Rafael, with our shop and training facility on Andersen Drive, and we replace water heaters across Terra Linda, Gerstle Park, Sun Valley, Peacock Gap, Santa Venetia and the rest of Marin. Licensed C-16 & C-36, Lic #1091739. Leaking heater or planning ahead? Call or text (415) 234-0370 or contact us. More on all our San Rafael plumbing services.







































