Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -rf0e2fcb150237dd9f2668d280682256c0cb07c75 -r0fdb539277f865425aba65d98e8e9147484a99e0
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision f0e2fcb150237dd9f2668d280682256c0cb07c75)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 0fdb539277f865425aba65d98e8e9147484a99e0)
@@ -631,11 +631,7 @@
         // close the state 1 opened valves
         valveControlForBCState1FillEnd();
         isBalChamberFillInProgress = FALSE;
-        //setDialysatePumpTargetRPM( D48_PUMP, getD48PumpSpeedForBCFill(), TRUE );
-        if ( TRUE == isFirstCycleBCSwitchingCompleted )
-        {
-            setDialysatePumpTargetRPM( D48_PUMP, getD48PumpSpeedForBCFill(), TRUE );
-        }
+        setDialysatePumpTargetRPM( D48_PUMP, getD48PumpSpeedForBCFill(), TRUE );
 
         // Transition to next state
         state = BAL_CHAMBER_STATE1_FILL_END;
@@ -809,11 +805,7 @@
         // close the valves
         valveControlForBCState2FillEnd();
         isBalChamberFillInProgress = FALSE;
-        //setDialysatePumpTargetRPM( D48_PUMP, getD48PumpSpeedForBCFill(), TRUE );
-        if ( TRUE == isFirstCycleBCSwitchingCompleted )
-        {
-            setDialysatePumpTargetRPM( D48_PUMP, getD48PumpSpeedForBCFill(), TRUE );
-        }
+        setDialysatePumpTargetRPM( D48_PUMP, getD48PumpSpeedForBCFill(), TRUE );
 
         //Transition to next state
         state = BAL_CHAMBER_STATE2_FILL_END;
Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -re0c45c725884d780b76dd54a617ab6ed333d7ba2 -r0fdb539277f865425aba65d98e8e9147484a99e0
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision e0c45c725884d780b76dd54a617ab6ed333d7ba2)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 0fdb539277f865425aba65d98e8e9147484a99e0)
@@ -1012,6 +1012,7 @@
         //calculateD48PumpSpeedForBCFill();
         initialPumpSpeed = getCalculatedD48PumpSpeedForBCFill();
         setD48PumpSpeedForBCFill( initialPumpSpeed );
+        setDialysatePumpTargetRPM( D48_PUMP, (U32)initialPumpSpeed, TRUE );
 
         //reset the flag
         isTreatmentParamUpdated = FALSE;