Index: firmware/App/Modes/TreatmentStop.c
===================================================================
diff -u -r16b02389432724c1bd15e9ce58579bff95050a03 -rd30cbd6a87d41e58709ae6ad8466f5e193a32397
--- firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision 16b02389432724c1bd15e9ce58579bff95050a03)
+++ firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision d30cbd6a87d41e58709ae6ad8466f5e193a32397)
@@ -447,15 +447,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
     {