Index: firmware/App/Modes/Rinseback.c
===================================================================
diff -u -rf3d625e2593ced120c4a98b9ed7e28b132445642 -r0bb3fe3f34c02bd19c36aff2b98876e46a2ad177
--- firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision f3d625e2593ced120c4a98b9ed7e28b132445642)
+++ firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision 0bb3fe3f34c02bd19c36aff2b98876e46a2ad177)
@@ -464,10 +464,12 @@
     // Otherwise, continue rinseback
     else
     {
-        // re-open VBV after air trap fill
+        // re-open VBV and restore BP rate after air trap fill
         if ( VALVE_POSITION_C_CLOSE == getSetValvePosition( VBV ) )
         {
             setValvePosition( VBV, VALVE_POSITION_B_OPEN );
+            // restore BP to rinseback blood flow rate
+            setBloodPumpTargetFlowRate( rinsebackRate_mL_min, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
         }
         // Has user requested rate change?
         if ( ( TRUE == incrRinsebackFlowRateRequested ) || ( TRUE == decrRinsebackFlowRateRequested ) )
@@ -651,10 +653,12 @@
             setBloodPumpTargetFlowRate( AIR_TRAP_FILL_BLOOD_FLOW_RATE, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
         }
     }
-    // re-open VBV after air trap fill
+    // re-open VBV and restore BP rate after air trap fill
     else if ( VALVE_POSITION_C_CLOSE == getSetValvePosition( VBV ) )
     {
         setValvePosition( VBV, VALVE_POSITION_B_OPEN );
+        // restore BP to rinseback blood flow rate
+        setBloodPumpTargetFlowRate( rinsebackRate_mL_min, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
     }
 
     return result;