Index: firmware/App/Modes/ModeFlush.c
===================================================================
diff -u -rdc6dc717eb63064c4eeacfb8da92636472908869 -rff676a9640e5dfe162de78d2b24f356f63bad5bb
--- firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision dc6dc717eb63064c4eeacfb8da92636472908869)
+++ firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision ff676a9640e5dfe162de78d2b24f356f63bad5bb)
@@ -952,7 +952,7 @@
     {
         SET_ALARM_WITH_1_U32_DATA( alarmDetectedPendingTrigger, prevFlushState )
     }
-    requestNewOperationMode( DG_MODE_FAUL );
+    requestNewOperationMode( DG_MODE_STAN );
 }
 
 /*********************************************************************//**
@@ -1119,10 +1119,14 @@
         {
             // Set the variables to fail and go to cancel water path. Set the pending alarm to no alarm so the cancel water path
             // will not be raising the alarm at end of the cancel water path. The recoverable alarm is raised here in this function
-            U32 cap                     = (U32)( STATE_OPEN == getSwitchStatus( CONCENTRATE_CAP ) ? CONCENTRATE_CAP : DIALYSATE_CAP );
             prevFlushState              = flushState;
             flushState                  = DG_FLUSH_STATE_CANCEL_WATER_PATH;
-            alarmDetectedPendingTrigger = ALARM_ID_DG_DIALYSATE_OR_CONC_CAP_NOT_IN_PROPER_POSITION;
+            alarmDetectedPendingTrigger = ALARM_ID_DG_DIALYSATE_CAP_NOT_IN_PROPER_POSITION;
+
+            if ( STATE_OPEN == getSwitchStatus( CONCENTRATE_CAP ) )
+            {
+                alarmDetectedPendingTrigger = ALARM_ID_DG_CONCENTRATE_CAP_NOT_IN_PROPER_POSITION;
+            }
         }
     }