Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -rc940dea020a10f2bab23ae92aa6932c375c26dd4 -re5713fcc4511a625434a4748f7dded3d237acdf8
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision c940dea020a10f2bab23ae92aa6932c375c26dd4)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision e5713fcc4511a625434a4748f7dded3d237acdf8)
@@ -7,8 +7,8 @@
 *
 * @file    ModeChemicalDisinfect.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      11-May-2023
+* @author  (last)      Michael Garthwaite
+* @date    (last)      16-May-2023
 *
 * @author  (original)  Sean
 * @date    (original)  04-Apr-2020
@@ -293,7 +293,7 @@
     deenergizeActuators( NO_PARK_CONC_PUMPS );
 
     initChemicalDisinfectMode();
-
+    setCurrentSubState( NO_SUB_STATE );
     setCPLDCleanLEDColor( CPLD_CLEAN_LED_YELLOW );
 
     // Set CD1 and CD2 conductivity sensors calibration table to be picked from the chemical disinfect calibration record
Index: firmware/App/Modes/ModeChemicalDisinfectFlush.c
===================================================================
diff -u -rc940dea020a10f2bab23ae92aa6932c375c26dd4 -re5713fcc4511a625434a4748f7dded3d237acdf8
--- firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision c940dea020a10f2bab23ae92aa6932c375c26dd4)
+++ firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision e5713fcc4511a625434a4748f7dded3d237acdf8)
@@ -7,8 +7,8 @@
 *
 * @file    ModeChemicalDisinfectFlush.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      11-May-2023
+* @author  (last)      Michael Garthwaite
+* @date    (last)      16-May-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  15-Nov-2022
@@ -197,7 +197,7 @@
     deenergizeActuators( NO_PARK_CONC_PUMPS );
 
     initChemicalDisinfectFlushMode();
-
+    setCurrentSubState( NO_SUB_STATE );
     setCPLDCleanLEDColor( CPLD_CLEAN_LED_YELLOW );
 
     // Upon transition to mode chemical flush set CD1 and CD2 calibration records to be picked to the normal
Index: firmware/App/Modes/ModeDrain.c
===================================================================
diff -u -rbec5bb7634100c96341d19cf89e540a01aa86b1d -re5713fcc4511a625434a4748f7dded3d237acdf8
--- firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision bec5bb7634100c96341d19cf89e540a01aa86b1d)
+++ firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision e5713fcc4511a625434a4748f7dded3d237acdf8)
@@ -7,8 +7,8 @@
 *
 * @file    ModeDrain.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      27-Apr-2023
+* @author  (last)      Michael Garthwaite
+* @date    (last)      16-May-2023
 *
 * @author  (original)  Leonardo Baloa
 * @date    (original)  20-Dec-2019
@@ -113,6 +113,7 @@
 {
     // re-initialize each time we transition to drain mode
     initDrainMode();
+    setCurrentSubState( NO_SUB_STATE );
 
     DG_RESERVOIR_ID_T inactiveReservoir = getInactiveReservoir();
 
Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -rc71859467ae9ff4058d9fc4abeae23ee86a7cb69 -re5713fcc4511a625434a4748f7dded3d237acdf8
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision c71859467ae9ff4058d9fc4abeae23ee86a7cb69)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision e5713fcc4511a625434a4748f7dded3d237acdf8)
@@ -7,8 +7,8 @@
 *
 * @file    ModeFill.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      11-May-2023
+* @author  (last)      Michael Garthwaite
+* @date    (last)      16-May-2023
 *
 * @author  (original)  Leonardo Baloa
 * @date    (original)  19-Nov-2019
@@ -217,7 +217,7 @@
 U32 transitionToFillMode( void )
 {
     initFillMode();
-
+    setCurrentSubState( NO_SUB_STATE );
     // Set initial actuator states
     setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
     setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
Index: firmware/App/Modes/ModeFlush.c
===================================================================
diff -u -rbec5bb7634100c96341d19cf89e540a01aa86b1d -re5713fcc4511a625434a4748f7dded3d237acdf8
--- firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision bec5bb7634100c96341d19cf89e540a01aa86b1d)
+++ 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;
Index: firmware/App/Modes/ModeGenIdle.c
===================================================================
diff -u -r764cdc9d339c3a99bb39c8c6a155fe2e84946aef -re5713fcc4511a625434a4748f7dded3d237acdf8
--- firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision 764cdc9d339c3a99bb39c8c6a155fe2e84946aef)
+++ firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision e5713fcc4511a625434a4748f7dded3d237acdf8)
@@ -8,8 +8,8 @@
 *
 * @file    ModeGenIdle.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      11-May-2023
+* @author  (last)      Michael Garthwaite
+* @date    (last)      16-May-2023
 *
 * @author  (original)  Quang Nguyen
 * @date    (original)  06-Aug-2021
@@ -102,7 +102,7 @@
 {
     // Re-initialize each time we transition to generation idle mode
     initGenIdleMode();
-
+    setCurrentSubState( NO_SUB_STATE );
     // Set initial actuator states
     setValveState( VSP, VALVE_STATE_CLOSED );
     setValveState( VPI, VALVE_STATE_OPEN );
@@ -300,6 +300,7 @@
 static DG_GEN_IDLE_MODE_STATE_T handleBadFillState( void )
 {
     DG_GEN_IDLE_MODE_STATE_T result = DG_GEN_IDLE_MODE_STATE_HANDLE_BAD_FILL;
+    U32 priorSubState = badFillState;
 
     // Execute current bad fill state
     switch ( badFillState )
@@ -330,6 +331,10 @@
             break;
     }
 
+    if ( priorSubState != badFillState )
+    {
+        setCurrentSubState( badFillState );
+    }
     return result;
 }
 
Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -rbec5bb7634100c96341d19cf89e540a01aa86b1d -re5713fcc4511a625434a4748f7dded3d237acdf8
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision bec5bb7634100c96341d19cf89e540a01aa86b1d)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision e5713fcc4511a625434a4748f7dded3d237acdf8)
@@ -7,8 +7,8 @@
 *
 * @file    ModeHeatDisinfect.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      04-May-2023
+* @author  (last)      Michael Garthwaite
+* @date    (last)      16-May-2023
 *
 * @author  (original)  Sean
 * @date    (original)  20-Apr-2020
@@ -318,7 +318,7 @@
     deenergizeActuators( NO_PARK_CONC_PUMPS );
 
     initHeatDisinfectMode();
-
+    setCurrentSubState( NO_SUB_STATE );
     setCPLDCleanLEDColor( CPLD_CLEAN_LED_ORANGE );
 
     return heatDisinfectState;
Index: firmware/App/Modes/ModeHeatDisinfectActiveCool.c
===================================================================
diff -u -rbec5bb7634100c96341d19cf89e540a01aa86b1d -re5713fcc4511a625434a4748f7dded3d237acdf8
--- firmware/App/Modes/ModeHeatDisinfectActiveCool.c	(.../ModeHeatDisinfectActiveCool.c)	(revision bec5bb7634100c96341d19cf89e540a01aa86b1d)
+++ firmware/App/Modes/ModeHeatDisinfectActiveCool.c	(.../ModeHeatDisinfectActiveCool.c)	(revision e5713fcc4511a625434a4748f7dded3d237acdf8)
@@ -7,8 +7,8 @@
 *
 * @file    ModeHeatDisinfectActiveCool.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      30-Mar-2023
+* @author  (last)      Michael Garthwaite
+* @date    (last)      16-May-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  18-Dec-2022
@@ -177,7 +177,7 @@
     deenergizeActuators( NO_PARK_CONC_PUMPS );
 
     initHeatDisinfectActiveCoolMode();
-
+    setCurrentSubState( NO_SUB_STATE );
     setCPLDCleanLEDColor( CPLD_CLEAN_LED_ORANGE );
 
     return heatDisinfectActiveCoolState;