Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r608780a6e5449b5a9710ac07299ec028117c9f4d -r62b202c33e90b032326da24aa4067e2f5032f448
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 608780a6e5449b5a9710ac07299ec028117c9f4d)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 62b202c33e90b032326da24aa4067e2f5032f448)
@@ -1144,8 +1144,11 @@
                 cmdResponse.rejectCode = DG_CMD_REQUEST_REJECT_REASON_INVALID_PARAMETER;
             }
         }
-        else
+        else if ( ( getCurrentOperationMode() != DG_MODE_HEAT ) && ( getCurrentOperationMode() != DG_MODE_CHEM ) )
         {
+            // The trimmer heater is controlled by HD except when DG is running heat disinfect or chemical disinfect.
+            // If the trimmer heater is run by DG in the cleaning modes but HD is expecting the heater to be off, it will
+            // keep sending the stop command all the time.
             stopHeater( DG_TRIMMER_HEATER );
         }