Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -rf1d684e536e7911b356a5d35320c909a1016d3d0 -r35a326b0f9f2fd83bac4be54e67ebde2d3f2c7e1
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision f1d684e536e7911b356a5d35320c909a1016d3d0)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 35a326b0f9f2fd83bac4be54e67ebde2d3f2c7e1)
@@ -153,7 +153,7 @@
     signalBloodPumpHardStop();
     signalDialOutPumpHardStop();
     signalDialInPumpHardStop();
-
+    setCurrentSubState( currentPostTreatmentState );
     collectTreatmentLogData();
 
     exitBloodLeakNormalState();
@@ -370,6 +370,7 @@
         // Done with draining the reservoirs
         state = HD_POST_TREATMENT_PATIENT_DISCONNECTION_STATE;
         doorClosedRequired( TRUE, TRUE );
+        setCurrentSubState( NO_SUB_STATE );
     }
 
     return state;
@@ -550,6 +551,7 @@
 
     if ( priorSubState != currentDrainReservoirState )
     {
+        setCurrentSubState( (U32)currentDrainReservoirState );
         SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_SUB_STATE_CHANGE, priorSubState, currentDrainReservoirState );
     }
 }