Index: firmware/App/Modes/TreatmentStop.c
===================================================================
diff -u -r38355442b06187fe5d57deca647b3adf2fa26b89 -r2dd90b6861e4cd229253ecb12467af5d657bb433
--- firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision 38355442b06187fe5d57deca647b3adf2fa26b89)
+++ firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision 2dd90b6861e4cd229253ecb12467af5d657bb433)
@@ -8,7 +8,7 @@
 * @file    TreatmentStop.c
 *
 * @author  (last)      Michael Garthwaite
-* @date    (last)      16-May-2023
+* @date    (last)      09-Jun-2023
 *
 * @author  (original)  Sean
 * @date    (original)  15-Jan-2020
@@ -86,6 +86,7 @@
 {
     initTreatmentStop();
     setCurrentSubState( (U32)currentTxStopState );
+    setCurrent4thLevelState( NO_SUB_STATE );
     // Set user alarm recovery actions allowed in this sub-mode
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, TRUE );
 
@@ -450,7 +451,7 @@
         data.timeout   = 0;
         data.countdown = 0;
 
-        if ( getRinsebackCompleted() != TRUE )
+        if ( ( getRinsebackCompleted() != TRUE ) && ( isAlarmActive( ALARM_ID_HD_TREATMENT_RINSEBACK_TIMEOUT_ALARM ) != TRUE ) )
         {
             if ( bloodSittingTimerCtr > 0 )
             {