Index: firmware/App/Modes/TreatmentStop.c
===================================================================
diff -u -rf1d684e536e7911b356a5d35320c909a1016d3d0 -ra1a592eaed002ee7ef84e56fb7864b8d40b14661
--- firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision f1d684e536e7911b356a5d35320c909a1016d3d0)
+++ firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision a1a592eaed002ee7ef84e56fb7864b8d40b14661)
@@ -85,7 +85,7 @@
 void transitionToTreatmentStop( void )
 {
     initTreatmentStop();
-
+    setCurrentSubState( (U32)currentTxStopState );
     // Set user alarm recovery actions allowed in this sub-mode
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, TRUE );
 
@@ -257,6 +257,7 @@
 
     if ( priorSubState != currentTxStopState )
     {
+        setCurrentSubState( (U32)currentTxStopState );
         SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_SUB_STATE_CHANGE, priorSubState, currentTxStopState );
     }
     // Broadcast treatment stop status