Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -reb01b53404b6d701dd413c08f2c7a54f8422732e -r2300599935a7171e3050a15d3b4690aa7d0bb7ef
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision eb01b53404b6d701dd413c08f2c7a54f8422732e)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 2300599935a7171e3050a15d3b4690aa7d0bb7ef)
@@ -622,7 +622,8 @@
     isFirstCycleNotDone = ( FALSE == isFirstCycleBCSwitchingCompleted );
     isFillCompleteOrFirstCycle = isBothFillsComplete || isFirstCycleNotDone;
 
-    if ( TRUE == isFillCompleteOrFirstCycle )
+    if ( ( TRUE == isFillCompleteOrFirstCycle ) ||
+       ( ( currentBalChamberSwitchingCounter >= balChamberValveClosePeriod ) && ( TRUE == getBalChamberSwitchingOnlyStatus() ) ) )
     {
         // close the state 1 opened valves
         valveControlForBCState1FillEnd();
@@ -820,7 +821,8 @@
     isFirstCycleNotDone = ( FALSE == isFirstCycleBCSwitchingCompleted );
     isFillCompleteOrFirstCycle = isBothFillsComplete || isFirstCycleNotDone;
 
-    if ( TRUE == isFillCompleteOrFirstCycle )
+    if ( ( TRUE == isFillCompleteOrFirstCycle ) ||
+       ( ( currentBalChamberSwitchingCounter >= balChamberValveClosePeriod ) && ( TRUE == getBalChamberSwitchingOnlyStatus() ) ) )
     {
         // close the valves
         valveControlForBCState2FillEnd();
@@ -1021,8 +1023,12 @@
 
             d48SpeedPostRangeCheck = RANGE( spentDialPumpSpeed, minD48Speed, maxD48Speed );
 
-            // Update the D48 pump speed
-            setD48PumpSpeedForBCFill( d48SpeedPostRangeCheck );
+            // Do not turn on the pump if the switching only is enabled in the standby mode.
+            if ( FALSE == getBalChamberSwitchingOnlyStatus() )
+            {
+                // Update the D48 pump speed
+                setD48PumpSpeedForBCFill( d48SpeedPostRangeCheck );
+            }
         }
 
         //Update spent fill is complete