diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index 3496a971c..662003e08 100644
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -7579,6 +7579,7 @@ void Stop()
   disable_heater();
   if(Stopped == false) {
     Stopped = true;
+    lcd_print_stop();
     Stopped_gcode_LastN = gcode_LastN; // Save last g_code for restart
     SERIAL_ERROR_START;
     SERIAL_ERRORLNRPGM(MSG_ERR_STOPPED);
diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp
index 5ba4824d7..b651c2737 100644
--- a/Firmware/temperature.cpp
+++ b/Firmware/temperature.cpp
@@ -685,6 +685,8 @@ void manage_heater()
 	{
       soft_pwm[e] = 0;
     }
+    if(target_temperature[e]==0)
+      soft_pwm[e] = 0;
 
     #ifdef WATCH_TEMP_PERIOD
     if(watchmillis[e] && millis() - watchmillis[e] > WATCH_TEMP_PERIOD)
@@ -812,6 +814,8 @@ void manage_heater()
         WRITE(HEATER_BED_PIN,LOW);
       }
     #endif
+      if(target_temperature_bed==0)
+        soft_pwm_bed = 0;
   #endif
   
 #ifdef HOST_KEEPALIVE_FEATURE