Index: firmware/App/Modes/Rinseback.c
===================================================================
diff -u -r96b82583300704c2039f5db5b2b138fb57e83459 -rf96b7660aca9960e02a44961bca8a006550760d6
--- firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision 96b82583300704c2039f5db5b2b138fb57e83459)
+++ firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision f96b7660aca9960e02a44961bca8a006550760d6)
@@ -1035,7 +1035,6 @@
     {
         RINSEBACK_DATA_PAYLOAD_T data;
         TREATMENT_STOP_PAYLOAD_T sdata;
-        BOOL bpRunning   = isBloodPumpRunning();
         U32 timeout = MAX_RINSEBACK_TIME  / ( MS_PER_SECOND / TASK_GENERAL_INTERVAL );
         U32 countdown = ( getRinsebackVolume() >= rinsebackTargetVolume_mL ? 0 : MAX_RINSEBACK_TIME );
         U32 stopTO = ( getRinsebackVolume() >= rinsebackTargetVolume_mL ? 0 : MAX_RINSEBACK_TIME );
@@ -1064,15 +1063,12 @@
         {
             data.rinsebackFlowRateMlMin = DEFAULT_RINSEBACK_FLOW_RATE_ML_MIN;
         }
-        if ( FALSE == bpRunning )
+        if ( getRinsebackCompleted() != TRUE )
         {
-            if ( getRinsebackCompleted() != TRUE )
+            if ( rinsebackTimerCtr > 0 )                                  // Timer set to zero when BP is running
             {
-                if ( rinsebackTimerCtr > 0 )
-                {
-                    data.timeout = timeout;
-                    data.countdown = countdown;
-                }
+                data.timeout = timeout;
+                data.countdown = countdown;
             }
         }
         if ( data.deliveredRinsebackVolumeMl >= rinsebackTargetVolume_mL )