Index: firmware/App/Modes/TreatmentEnd.c
===================================================================
diff -u -rf1d684e536e7911b356a5d35320c909a1016d3d0 -ra1a592eaed002ee7ef84e56fb7864b8d40b14661
--- firmware/App/Modes/TreatmentEnd.c	(.../TreatmentEnd.c)	(revision f1d684e536e7911b356a5d35320c909a1016d3d0)
+++ firmware/App/Modes/TreatmentEnd.c	(.../TreatmentEnd.c)	(revision a1a592eaed002ee7ef84e56fb7864b8d40b14661)
@@ -114,7 +114,7 @@
     // Set user alarm recovery actions allowed in this sub-mode
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, TRUE );
     setAlarmUserActionEnabled( ALARM_USER_ACTION_END_TREATMENT, TRUE );
-
+    setCurrentSubState( (U32)treatmentEndState );
     // Set valves, pumps and heater
     setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
     setValvePosition( VDO, VALVE_POSITION_C_CLOSE );
@@ -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