diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp
index dc4c797a5..9e8fdd36d 100644
--- a/Firmware/temperature.cpp
+++ b/Firmware/temperature.cpp
@@ -1227,6 +1227,9 @@ void temp_runaway_stop(bool isPreheat, bool isBed)
 		card.sdprinting = false;
 		card.closefile();
 	}
+	// Clean the input command queue 
+	// This is necessary, because in command queue there can be commands which would later set heater or bed temperature.
+	cmdqueue_reset();
 	
 	disable_heater();
 	disable_x();