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();