Index: firmware/App/Modes/ModeService.c
===================================================================
diff -u -r1bff8e530735be63ba557b77557a0bc2ac4b37b2 -rce64b7e15824641a6a6465c28eec5d8ec593f110
--- firmware/App/Modes/ModeService.c	(.../ModeService.c)	(revision 1bff8e530735be63ba557b77557a0bc2ac4b37b2)
+++ firmware/App/Modes/ModeService.c	(.../ModeService.c)	(revision ce64b7e15824641a6a6465c28eec5d8ec593f110)
@@ -59,6 +59,7 @@
 {
     doorClosedRequired( FALSE, FALSE );
     syringeDetectionRequired( FALSE );
+    setCurrentSubState( NO_SUB_STATE );
 
     // Set user alarm recovery actions allowed in this mode
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, FALSE );