Index: firmware/App/Modes/TreatmentEnd.c
===================================================================
diff -u -r6a26a0122d20ec075c3f719d5379583359500d8a -rcd5be724d5a3ba7457e761191d82f278654d7f5c
--- firmware/App/Modes/TreatmentEnd.c	(.../TreatmentEnd.c)	(revision 6a26a0122d20ec075c3f719d5379583359500d8a)
+++ firmware/App/Modes/TreatmentEnd.c	(.../TreatmentEnd.c)	(revision cd5be724d5a3ba7457e761191d82f278654d7f5c)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2021-2023 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2021-2024 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    TreatmentEnd.c
 *
-* @author  (last)      Michael Garthwaite
-* @date    (last)      10-Aug-2023
+* @author  (last)      Sean Nash
+* @date    (last)      11-Oct-2023
 *
 * @author  (original)  Sean Nash
 * @date    (original)  05-Feb-2021
@@ -189,7 +189,7 @@
     TREATMENT_END_STATE_T priorSubState = treatmentEndState;
 
     // Has max time waiting for user to initiate final rinseback been exceeded?
-    if ( ++txEndTimerCtr > TX_END_TIMEOUT_MS )
+    if ( ( ++txEndTimerCtr > TX_END_TIMEOUT_MS ) && ( txEndAlarmRinsebackRequested != TRUE ) )
     {
         activateAlarmNoData( ALARM_ID_HD_END_TREATMENT_TIMEOUT_ALARM );
     }