Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r3f2b9de757500da37e0ed8881e4e906d94f3076c -ra69fcb7945b0300b47ce3287f8cb22c7c26171dc
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 3f2b9de757500da37e0ed8881e4e906d94f3076c)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision a69fcb7945b0300b47ce3287f8cb22c7c26171dc)
@@ -475,7 +475,18 @@
 static HD_STANDBY_STATE_T handleStandbyModeWaitForTreatmentState( void )
 {
     HD_STANDBY_STATE_T state = STANDBY_WAIT_FOR_TREATMENT_STATE;
+    DG_OP_MODE_T dgOperationMode = getDGOpMode();
 
+    if ( DG_MODE_FILL == dgOperationMode )
+    {
+        cmdStopDGFill();
+    }
+
+    if ( DG_MODE_CIRC == dgOperationMode )
+    {
+        cmdStopDG();
+    }
+
     if ( TRUE == treatStartReqReceived )
     {
         // Initialize treatment modes before starting a new treatment