Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r696e732c9742535a58b9c65f243df7cd797d1423 -r9afca35aabacd4a52a8eb39828e78e25ac4165f9
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 696e732c9742535a58b9c65f243df7cd797d1423)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 9afca35aabacd4a52a8eb39828e78e25ac4165f9)
@@ -224,9 +224,17 @@
     {
         if ( HEATER_EXEC_STATE_OFF == heatersStatus[ heater ].state )
         {
-            status                                    = TRUE;
             heatersStatus[ heater ].startHeaterSignal = TRUE;
+            status                                    = TRUE;
         }
+
+#ifndef _RELEASE_
+        if ( ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_TRIMMER_HEATER ) ) && ( DG_TRIMMER_HEATER == heater ) )
+        {
+            heatersStatus[ heater ].startHeaterSignal = FALSE;
+            status                                    = FALSE;
+        }
+#endif
     }
     else
     {
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rf192234d80556802fa42e62f8c1b20d1474f82f1 -r9afca35aabacd4a52a8eb39828e78e25ac4165f9
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision f192234d80556802fa42e62f8c1b20d1474f82f1)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 9afca35aabacd4a52a8eb39828e78e25ac4165f9)
@@ -1137,12 +1137,7 @@
 
             if ( TRUE == isSet )
             {
-#ifndef _RELEASE_
-                if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_TRIMMER_HEATER ) != SW_CONFIG_ENABLE_VALUE )
-#endif
-                {
-                    startHeater( DG_TRIMMER_HEATER );
-                }
+                startHeater( DG_TRIMMER_HEATER );
             }
             else
             {