Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -rf1d684e536e7911b356a5d35320c909a1016d3d0 -rce64b7e15824641a6a6465c28eec5d8ec593f110
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision f1d684e536e7911b356a5d35320c909a1016d3d0)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision ce64b7e15824641a6a6465c28eec5d8ec593f110)
@@ -153,7 +153,7 @@
     signalBloodPumpHardStop();
     signalDialOutPumpHardStop();
     signalDialInPumpHardStop();
-
+    setCurrentSubState( NO_SUB_STATE );
     collectTreatmentLogData();
 
     exitBloodLeakNormalState();
@@ -550,6 +550,7 @@
 
     if ( priorSubState != currentDrainReservoirState )
     {
+        setCurrentSubState( (U32)currentDrainReservoirState );
         SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_SUB_STATE_CHANGE, priorSubState, currentDrainReservoirState );
     }
 }