Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -r269317d07ab6ccbff5294953d2ecc1cbc43336ab -re76027712dc243def295733f6086450d9de0d5c0
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 269317d07ab6ccbff5294953d2ecc1cbc43336ab)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision e76027712dc243def295733f6086450d9de0d5c0)
@@ -599,23 +599,17 @@
             cmdStartDGDrain( DRAIN_RESERVOIR_TO_VOLUME_ML, TRUE, rinseConcentrateLines, TRUE );
             dgCommandSent = TRUE;
         }
-        else if ( TRUE == getDGCommandResponse( DG_CMD_START_DRAIN, &dgCmdResp ) )
+        else if ( ( TRUE == getDGCommandResponse( DG_CMD_START_DRAIN, &dgCmdResp ) ) && ( dgCmdResp.rejectCode != DG_CMD_REQUEST_REJECT_REASON_NONE ) )
         {
-            if ( DG_CMD_REQUEST_REJECT_REASON_NONE == dgCmdResp.rejectCode )
-            {
-                if ( DG_MODE_DRAI == getDGOpMode() )
-                {
-                    // If the drain has started, transition to drain state
-                    dgCommandSent = FALSE;
-                    state         = DRAIN_RESERVOIR_DRAIN_STATE;
-                }
-            }
-            else
-            {
-                dgCommandSent = FALSE;
-            }
+            dgCommandSent = FALSE;
         }
     }
+    else if ( DG_MODE_DRAI == getDGOpMode() )
+    {
+        // If the drain has started, transition to drain state
+        dgCommandSent = FALSE;
+        state         = DRAIN_RESERVOIR_DRAIN_STATE;
+    }
 
     return state;
 }