Index: firmware/App/Modes/TreatmentStop.c
===================================================================
diff -u -r38d35232be10f481f78c24fed07958dfc0e327dc -r3833c8a7a90288a6010a625a884048c775c598d3
--- firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision 38d35232be10f481f78c24fed07958dfc0e327dc)
+++ firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision 3833c8a7a90288a6010a625a884048c775c598d3)
@@ -7,8 +7,8 @@
 *
 * @file    TreatmentStop.c
 *
-* @author  (last)      Michael Garthwaite
-* @date    (last)      15-Jun-2023
+* @author  (last)      Sean Nash
+* @date    (last)      21-Jun-2023
 *
 * @author  (original)  Sean
 * @date    (original)  15-Jan-2020
@@ -405,15 +405,19 @@
     // Ensure we do not sit in stopped state for too long (if blood in line)
     if ( getRinsebackCompleted() != TRUE )
     {
-        if ( ++bloodSittingTimerCtr > WARN_TIME_BLOOD_SITTING )
+        bloodSittingTimerCtr++;
+        if ( FALSE == doesAlarmStatusIndicateEndTxOnly() )                  // Alarms appropriate only if we are not already at an alarm stop, end Tx only
         {
-            activateAlarmNoData( ALARM_ID_HD_BLOOD_SITTING_WARNING );
+            if ( bloodSittingTimerCtr > WARN_TIME_BLOOD_SITTING )
+            {
+                activateAlarmNoData( ALARM_ID_HD_BLOOD_SITTING_WARNING );
+            }
+            if ( bloodSittingTimerCtr > MAX_TIME_BLOOD_SITTING )
+            {
+                // Activate the alarm
+                activateAlarmNoData( ALARM_ID_HD_TREATMENT_STOPPED_NO_RINSEBACK );
+            }
         }
-        if ( bloodSittingTimerCtr > MAX_TIME_BLOOD_SITTING )
-        {
-            // Activate the alarm
-            activateAlarmNoData( ALARM_ID_HD_TREATMENT_STOPPED_NO_RINSEBACK );
-        }
     }
     else
     {