Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r28b5f2e7f757647145a82a39aca0a5f3652c68a1 -r79970a6b91c43d05355d5ebcc1b5be09b98b4471
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 28b5f2e7f757647145a82a39aca0a5f3652c68a1)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 79970a6b91c43d05355d5ebcc1b5be09b98b4471)
@@ -275,8 +275,6 @@
  *************************************************************************/
 void stopPrimaryHeater( void )
 {
-    setMainPrimaryHeaterPWM( HEATERS_MIN_DUTY_CYCLE );
-    setSmallPrimaryHeaterPWM( HEATERS_MIN_DUTY_CYCLE );
     isPrimaryHeaterOn = FALSE;
 }
 
@@ -289,7 +287,6 @@
  *************************************************************************/
 void stopTrimmerHeater( void )
 {
-    setTrimmerHeaterPWM( HEATERS_MIN_DUTY_CYCLE );
     isTrimmerHeaterOn = FALSE;
 }
 
@@ -704,6 +701,8 @@
         // Switch to off state. Set the duty cycles to 0
         mainPrimaryHeaterDutyCycle = HEATERS_MIN_DUTY_CYCLE;
         smallPrimaryHeaterDutyCycle = HEATERS_MIN_DUTY_CYCLE;
+        setMainPrimaryHeaterPWM( HEATERS_MIN_DUTY_CYCLE );
+        setSmallPrimaryHeaterPWM( HEATERS_MIN_DUTY_CYCLE );
         state = PRIMARY_HEATERS_EXEC_STATE_OFF;
     }
 
@@ -779,6 +778,7 @@
     {
         // Set the duty cycle to 0 and switch to off state
         trimmerHeaterDutyCycle = HEATERS_MIN_DUTY_CYCLE;
+        setTrimmerHeaterPWM( HEATERS_MIN_DUTY_CYCLE );
         state = TRIMMER_HEATER_EXEC_STATE_OFF;
     }