Yes, the heater is turned off automatically.