Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -r8481d10fb15d4ecb648ee10804b7ab31a18c720d -r1535047d4952ab49b1ed7abb7a8b5831e59850f7
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 8481d10fb15d4ecb648ee10804b7ab31a18c720d)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 1535047d4952ab49b1ed7abb7a8b5831e59850f7)
@@ -970,7 +970,7 @@
     checkSpentFillComplete( spentDialPressure );
 
     // Check both spent and fresh side fill is complete
-    if ( ( TRUE == isSpentFillComplete ) && ( TRUE == isPressureStabilizedDuringFill ) )
+    if ( ( TRUE == isSpentFillComplete ) && ( TRUE == isPressureStabilizedDuringFill ) || ( FALSE == isFirstCycleBCSwitchingCompleted ) )
     {
         // close the state 1 opened valves
         valveControlForBCState1FillEnd();
@@ -1139,7 +1139,7 @@
     checkSpentFillComplete( spentDialPressure );
 
     // Check switching cycle time or pressure check for valve closure
-    if ( ( TRUE == isSpentFillComplete ) && ( TRUE == isPressureStabilizedDuringFill ) )
+    if ( ( TRUE == isSpentFillComplete ) && ( TRUE == isPressureStabilizedDuringFill ) || ( FALSE == isFirstCycleBCSwitchingCompleted ) )
     {
         // close the valves
         valveControlForBCState2FillEnd();