diff --git a/src/drivers/heater/heater.cpp b/src/drivers/heater/heater.cpp
index 53360172ee..9eb699e4fb 100644
--- a/src/drivers/heater/heater.cpp
+++ b/src/drivers/heater/heater.cpp
@@ -417,9 +417,14 @@ void Heater::Run()
 			_temperature_target_met = false;
 		}
 
-		_heater_on = true;
-		heater_on();
-		ScheduleDelayed(_controller_time_on_usec);
+		if (_controller_time_on_usec > 0) {
+			_heater_on = true;
+			heater_on();
+			ScheduleDelayed(_controller_time_on_usec);
+
+		} else {
+			ScheduleDelayed(CONTROLLER_PERIOD_DEFAULT);
+		}
 	}
 
 	publish_status();