Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r8116b493a8085f28f85e5a9e8ead7e18d0dc77a8 -rd5b87d7dab8613f3963fb66f8833d210f127fa1f
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 8116b493a8085f28f85e5a9e8ead7e18d0dc77a8)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision d5b87d7dab8613f3963fb66f8833d210f127fa1f)
@@ -298,13 +298,6 @@
 
     for ( heater = DD_HEATERS_FIRST; heater < NUM_OF_DD_HEATERS; heater++ )
     {
-        // Check if the heater is requested to be off
-        if ( FALSE == heatersStatus[ heater ].heaterOnState )
-        {
-            // stop the heater
-            stopHeater( heater );
-        }
-
         switch( heatersStatus[ heater ].state )
         {
             case HEATER_EXEC_STATE_OFF:
@@ -329,6 +322,12 @@
                 SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_HEATERS_INVALID_EXEC_STATE, heater );
                 break;
         }
+        // Check if the heater is requested to be off
+        if ( FALSE == heatersStatus[ heater ].heaterOnState )
+        {
+            // stop the heater
+            stopHeater( heater );
+        }
     }
 }