Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -rce64b7e15824641a6a6465c28eec5d8ec593f110 -r35a326b0f9f2fd83bac4be54e67ebde2d3f2c7e1
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision ce64b7e15824641a6a6465c28eec5d8ec593f110)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 35a326b0f9f2fd83bac4be54e67ebde2d3f2c7e1)
@@ -153,7 +153,7 @@
     signalBloodPumpHardStop();
     signalDialOutPumpHardStop();
     signalDialInPumpHardStop();
-    setCurrentSubState( NO_SUB_STATE );
+    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;