Index: firmware/App/Modes/TreatmentEnd.c
===================================================================
diff -u -rf0c16ca7223ad48b7bdb86b8f010b74b550c0051 -r6edac5041f1ec25a8362742b697f7c49416f0732
--- firmware/App/Modes/TreatmentEnd.c	(.../TreatmentEnd.c)	(revision f0c16ca7223ad48b7bdb86b8f010b74b550c0051)
+++ firmware/App/Modes/TreatmentEnd.c	(.../TreatmentEnd.c)	(revision 6edac5041f1ec25a8362742b697f7c49416f0732)
@@ -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 );
     }