Index: firmware/App/Modes/Rinseback.c
===================================================================
diff -u -r2c7621118579421e1ca3cb00ddccce808fd3a1b8 -r2488c579eea463336c9afd2ef3268316b50036c6
--- firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision 2c7621118579421e1ca3cb00ddccce808fd3a1b8)
+++ firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision 2488c579eea463336c9afd2ef3268316b50036c6)
@@ -1071,14 +1071,18 @@
         broadcastData( MSG_ID_HD_RINSEBACK_PROGRESS, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( RINSEBACK_DATA_PAYLOAD_T ) );
 
         // Send blood sitting count down to UI for alarm dialog
-        sdata.timeout   = stopTO / ( MS_PER_SECOND / TASK_GENERAL_INTERVAL );
+        sdata.timeout   = 0;
         sdata.countdown = 0;
 
         if ( getRinsebackCompleted() != TRUE )
         {
             if ( rinsebackTimerCtr > 0 )
             {
-                sdata.countdown = ( rinsebackTimerCtr > MAX_TIME_BLOOD_SITTING ? 0 : ( MAX_TIME_BLOOD_SITTING - rinsebackTimerCtr ) / ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) );
+                if ( FALSE == isBloodPumpRunning() )
+                {
+                    sdata.timeout   = stopTO / ( MS_PER_SECOND / TASK_GENERAL_INTERVAL );
+                    sdata.countdown = ( rinsebackTimerCtr > MAX_TIME_BLOOD_SITTING ? 0 : ( MAX_TIME_BLOOD_SITTING - rinsebackTimerCtr ) / ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) );
+                }
             }
         }
         broadcastData( MSG_ID_HD_TREATMENT_STOP_TIMER_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&sdata, sizeof( TREATMENT_STOP_PAYLOAD_T ) );