Index: firmware/App/Modes/TreatmentEnd.c
===================================================================
diff -u -rf1d684e536e7911b356a5d35320c909a1016d3d0 -rce64b7e15824641a6a6465c28eec5d8ec593f110
--- firmware/App/Modes/TreatmentEnd.c	(.../TreatmentEnd.c)	(revision f1d684e536e7911b356a5d35320c909a1016d3d0)
+++ firmware/App/Modes/TreatmentEnd.c	(.../TreatmentEnd.c)	(revision ce64b7e15824641a6a6465c28eec5d8ec593f110)
@@ -211,6 +211,7 @@
 
     if ( priorSubState != treatmentEndState )
     {
+        setCurrentSubState( (U32)treatmentEndState );
         SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_SUB_STATE_CHANGE, priorSubState, treatmentEndState );
     }
     // Re-circulate flags should be handled by now - reset in case not handled by current state