Index: firmware/App/Modes/ModeFlush.c
===================================================================
diff -u -rcf2feb4325923f7a08d05a2bf543722147e8c18d -reeaab2a9a685fb18845888d91040d3aa01977f6d
--- firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision cf2feb4325923f7a08d05a2bf543722147e8c18d)
+++ firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision eeaab2a9a685fb18845888d91040d3aa01977f6d)
@@ -7,8 +7,8 @@
 *
 * @file    ModeFlush.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      27-Feb-2023
+* @author  (last)      Michael Garthwaite
+* @date    (last)      16-May-2023
 *
 * @author  (original)  Leonardo Baloa
 * @date    (original)  20-Dec-2019
@@ -171,7 +171,7 @@
     deenergizeActuators( NO_PARK_CONC_PUMPS );
 
     initFlushMode();
-
+    setCurrentSubState( NO_SUB_STATE );
     setCPLDCleanLEDColor( CPLD_CLEAN_LED_BLUE );
 
     return flushState;
@@ -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;
+            }
         }
     }