Index: firmware/App/Modes/TreatmentRecirc.c
===================================================================
diff -u -rf1d684e536e7911b356a5d35320c909a1016d3d0 -ra1a592eaed002ee7ef84e56fb7864b8d40b14661
--- firmware/App/Modes/TreatmentRecirc.c	(.../TreatmentRecirc.c)	(revision f1d684e536e7911b356a5d35320c909a1016d3d0)
+++ firmware/App/Modes/TreatmentRecirc.c	(.../TreatmentRecirc.c)	(revision a1a592eaed002ee7ef84e56fb7864b8d40b14661)
@@ -114,7 +114,7 @@
 void transitionToTreatmentRecirc( void )
 {
     initTreatmentRecirc();
-
+    setCurrentSubState( (U32)treatmentRecircState );
     doorClosedRequired( TRUE, TRUE );
 
     // Set valves to safe state
@@ -221,6 +221,7 @@
 
     if ( priorSubState != treatmentRecircState )
     {
+        setCurrentSubState( (U32)treatmentRecircState );
         SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_SUB_STATE_CHANGE, priorSubState, treatmentRecircState );
     }
     // Re-circulate flags should be handled by now - reset in case not handled by current state