Index: firmware/App/Modes/ModeDrain.c
===================================================================
diff -u -r67da3f0d10e1143173b1e8c29061097d609d8623 -rd19a072db6880577f677093929b53445e34a33e3
--- firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision 67da3f0d10e1143173b1e8c29061097d609d8623)
+++ firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision d19a072db6880577f677093929b53445e34a33e3)
@@ -113,6 +113,7 @@
 {
     // re-initialize each time we transition to drain mode
     initDrainMode();
+    setCurrentSubState( NO_SUB_STATE );
 
     DG_RESERVOIR_ID_T inactiveReservoir = getInactiveReservoir();