Index: firmware/App/Modes/ModeDrain.c
===================================================================
diff -u -r8d3b7eca14745edd2fc1e475197c8bb0ef3c9d73 -reeaab2a9a685fb18845888d91040d3aa01977f6d
--- firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision 8d3b7eca14745edd2fc1e475197c8bb0ef3c9d73)
+++ firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision eeaab2a9a685fb18845888d91040d3aa01977f6d)
@@ -7,8 +7,8 @@
 *
 * @file    ModeDrain.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      20-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();