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;
 }