Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -rfd897db8177752330ad08d877e0a13620513dbdc -radb896670118e8db2f2bfa81c4325e8aad241ff3
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision fd897db8177752330ad08d877e0a13620513dbdc)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision adb896670118e8db2f2bfa81c4325e8aad241ff3)
@@ -686,20 +686,22 @@
 
     // Check both spent and fresh side fill is complete
     isBothFillsComplete = ( TRUE == isSpentFillComplete ) && ( TRUE == isPressureStabilizedDuringFill );
-    isFirstCycleNotDone = ( FALSE == isFirstCycleBCSwitchingCompleted );
+    isFirstCycleNotDone = ( ( FALSE == isFirstCycleBCSwitchingCompleted ) && ( currentBalChamberSwitchingCounter >= balChamberValveClosePeriod ) && ( TRUE == getBalChamberSwitchingOnlyStatus() ) );
 
     if ( FALSE == getBalChamberSwitchingOnlyStatus() )
     {
         isFillCompleteOrFirstCycle = isBothFillsComplete || isFirstCycleNotDone;
     }
 
-    if ( ( TRUE == isFillCompleteOrFirstCycle ) ||
-       ( ( currentBalChamberSwitchingCounter >= balChamberValveClosePeriod ) && ( TRUE == getBalChamberSwitchingOnlyStatus() ) ) )
+    if ( TRUE == isFillCompleteOrFirstCycle )
     {
         // close the state 1 opened valves
         valveControlForBCState1FillEnd();
         isBalChamberFillInProgress = FALSE;
-        setDialysatePumpTargetRPM( D48_PUMP, getD48PumpSpeedForBCFill(), TRUE );
+        if ( FALSE == getBalChamberSwitchingOnlyStatus() )
+        {
+            setDialysatePumpTargetRPM( D48_PUMP, getD48PumpSpeedForBCFill(), TRUE );
+        }
 
         // Transition to next state
         state = BAL_CHAMBER_STATE1_FILL_END;
@@ -934,20 +936,22 @@
 
     // Check switching cycle time or pressure check for valve closure
     isBothFillsComplete = ( TRUE == isSpentFillComplete ) && ( TRUE == isPressureStabilizedDuringFill );
-    isFirstCycleNotDone = ( FALSE == isFirstCycleBCSwitchingCompleted );
+    isFirstCycleNotDone = ( ( FALSE == isFirstCycleBCSwitchingCompleted ) && ( currentBalChamberSwitchingCounter >= balChamberValveClosePeriod ) && ( TRUE == getBalChamberSwitchingOnlyStatus() ) );
 
     if ( FALSE == getBalChamberSwitchingOnlyStatus() )
     {
         isFillCompleteOrFirstCycle = isBothFillsComplete || isFirstCycleNotDone;
     }
 
-    if ( ( TRUE == isFillCompleteOrFirstCycle ) ||
-       ( ( currentBalChamberSwitchingCounter >= balChamberValveClosePeriod ) && ( TRUE == getBalChamberSwitchingOnlyStatus() ) ) )
+    if ( TRUE == isFillCompleteOrFirstCycle )
     {
         // close the valves
         valveControlForBCState2FillEnd();
         isBalChamberFillInProgress = FALSE;
-        setDialysatePumpTargetRPM( D48_PUMP, getD48PumpSpeedForBCFill(), TRUE );
+        if ( FALSE == getBalChamberSwitchingOnlyStatus() )
+        {
+            setDialysatePumpTargetRPM( D48_PUMP, getD48PumpSpeedForBCFill(), TRUE );
+        }
 
         //Transition to next state
         state = BAL_CHAMBER_STATE2_FILL_END;