Index: firmware/App/Modes/TreatmentStop.c
===================================================================
diff -u -rccfd15568f1e3d304320c2babb2fd4bcf0413304 -r74be223d47ea7bb0ac7d814e74d3627d830a5fac
--- firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision ccfd15568f1e3d304320c2babb2fd4bcf0413304)
+++ firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision 74be223d47ea7bb0ac7d814e74d3627d830a5fac)
@@ -140,16 +140,19 @@
  *************************************************************************/
 void execTreatmentStop( void )
 {
-    // Ensure we do not sit in stopped state for too long
-    if ( ++bloodSittingTimerCtr > WARN_TIME_BLOOD_SITTING )
+    // Ensure we do not sit in stopped state for too long (if blood in line)
+    if ( getRinsebackCompleted() != TRUE )
     {
-        activateAlarmNoData( ALARM_ID_BLOOD_SITTING_WARNING );
+        if ( ++bloodSittingTimerCtr > WARN_TIME_BLOOD_SITTING )
+        {
+            activateAlarmNoData( ALARM_ID_BLOOD_SITTING_WARNING );
+        }
+        if ( bloodSittingTimerCtr > MAX_TIME_BLOOD_SITTING )
+        {
+            // Activate the alarm
+            activateAlarmNoData( ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK );
+        }
     }
-    if ( bloodSittingTimerCtr > MAX_TIME_BLOOD_SITTING )
-    {
-        // Activate the alarm
-        activateAlarmNoData( ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK );
-    }
 
     // Execute treatment stop sub-mode state machine
     switch ( currentTxStopState )
@@ -236,11 +239,13 @@
 {
     if ( ++stopPublishTimerCtr >= getU32OverrideValue( &treatmentStopPublishInterval ) )
     {
-        U32 timeout = MAX_TIME_BLOOD_SITTING  / ( MS_PER_SECOND / TASK_GENERAL_INTERVAL );
-        U32 countdown = ( bloodSittingTimerCtr >= MAX_TIME_BLOOD_SITTING ? 0 : ( MAX_TIME_BLOOD_SITTING - bloodSittingTimerCtr ) / ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) );
+        TREATMENT_STOP_PAYLOAD_T data;
 
+        data.timeout   = MAX_TIME_BLOOD_SITTING / ( MS_PER_SECOND / TASK_GENERAL_INTERVAL );
+        data.countdown = ( bloodSittingTimerCtr >= MAX_TIME_BLOOD_SITTING ? 0 : ( MAX_TIME_BLOOD_SITTING - bloodSittingTimerCtr ) / ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) );
+
         stopPublishTimerCtr = 0;
-        broadcastTreatmentStopData( timeout, countdown );
+        broadcastData( MSG_ID_HD_TREATMENT_STOP_TIMER_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( TREATMENT_STOP_PAYLOAD_T ) );
     }
 }