Index: firmware/App/Modes/ModeFlush.c
===================================================================
diff -u -re12f1b3d41ae133bc0975fcb126e431c2bedda59 -re5713fcc4511a625434a4748f7dded3d237acdf8
--- firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision e12f1b3d41ae133bc0975fcb126e431c2bedda59)
+++ firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision e5713fcc4511a625434a4748f7dded3d237acdf8)
@@ -7,8 +7,8 @@
 *
 * @file    ModeFlush.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      30-Mar-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;
@@ -1043,7 +1043,7 @@
 
     // NOTE: the drain status should be checked once the reservoirs parameters are initialized. This is to make sure the
     // the timers for stable drain time are initialized prior to using them again
-    isDrainComplete = hasTargetDrainVolumeBeenReached( r, drainSteadyStateTimeout );
+    isDrainComplete = hasTargetDrainToZeroBeenReached( r, drainSteadyStateTimeout );
 
     if ( TRUE == isDrainComplete )
     {