Yes, there is a bypass, and it is controlled by what they call a unitherm governor. That is a fancy word for a thermostat, very similar to the one in your car. It sounds like yours may be stuck open, or the spring buggered out. They aren\'t too hard to check out if you are handy with a wrench. It is located right where the water pipes attach to the heater.