Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r28310e94db333fdc125918afa74d212b511e2425 -rfcb237583539b86ce2689e37b38f90e599e20edd
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 28310e94db333fdc125918afa74d212b511e2425)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision fcb237583539b86ce2689e37b38f90e599e20edd)
@@ -785,7 +785,28 @@
         }
         state = STANDBY_WAIT_FOR_DG_CLEANING_MODE_CMD_RESPONSE_STATE;
     }
+    else
+    {
+        switch ( getDGOpMode() )
+        {
+            case DG_MODE_FLUS:
+            case DG_MODE_HEAT:
+            case DG_MODE_CHEM:
+            case DG_MODE_CHFL:
+            case DG_MODE_ROPS:
+                // This is for the situations that any of the disinfect modes are started using the proxy commands while the HD
+                // is in this state of the Standby Mode.
+                setRequestedCleaningMode( getDGOpMode() );
+                state                                   = STANDBY_WAIT_FOR_DG_CLEANING_MODE_TO_START_STATE;
+                currentDGCleaningMode.startCleaningMode = FALSE;
+                break;
 
+            default:
+                // Do nothing we are not in the cleaning mode
+                break;
+        }
+    }
+
     return state;
 }