Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -rf874efc76625e3d3aa5de4c13ba01a9d7e651216 -r1d6c1c5544f09d5b38053cd4f91e8e64584dcdff
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision f874efc76625e3d3aa5de4c13ba01a9d7e651216)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 1d6c1c5544f09d5b38053cd4f91e8e64584dcdff)
@@ -8,7 +8,7 @@
 * @file    ModePostTreat.c
 *
 * @author  (last)      Michael Garthwaite
-* @date    (last)      15-May-2023
+* @date    (last)      02-Jun-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -153,7 +153,7 @@
     signalBloodPumpHardStop();
     signalDialOutPumpHardStop();
     signalDialInPumpHardStop();
-    setCurrentSubState( NO_SUB_STATE );
+    setCurrentSubState( (U32)currentDrainReservoirState );
     collectTreatmentLogData();
 
     exitBloodLeakNormalState();
@@ -390,20 +390,17 @@
     OPN_CLS_STATE_T frontDoor       = getSwitchStatus( FRONT_DOOR );
     OPN_CLS_STATE_T pumpTrack       = getSwitchStatus( PUMP_TRACK_SWITCH );
 
-    if ( ( STATE_CLOSED == frontDoor ) && ( STATE_CLOSED == pumpTrack ) )
-    {
 #ifndef _RELEASE_
-        if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) )
-        {
-            patientDisconnectionConfirmed = TRUE;
-        }
+    if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) )
+    {
+        patientDisconnectionConfirmed = TRUE;
+    }
 #endif
 
-        if ( TRUE == patientDisconnectionConfirmed )
-        {
-            patientDisconnectionConfirmed = FALSE;
-            state                         = HD_POST_TREATMENT_DISPOSABLE_REMOVAL_STATE;
-        }
+    if ( TRUE == patientDisconnectionConfirmed )
+    {
+        patientDisconnectionConfirmed = FALSE;
+        state                         = HD_POST_TREATMENT_DISPOSABLE_REMOVAL_STATE;
     }
 
     return state;