Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -rcdce53248c15df67085b8d5ead63860d1704a5d0 -rdb7a07277014e802f582716c4215044ff905266b
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision cdce53248c15df67085b8d5ead63860d1704a5d0)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision db7a07277014e802f582716c4215044ff905266b)
@@ -686,7 +686,7 @@
 
     // Check both spent and fresh side fill is complete
     isBothFillsComplete = ( TRUE == isSpentFillComplete ) && ( TRUE == isPressureStabilizedDuringFill );
-    isFirstCycleNotDone = ( FALSE == isFirstCycleBCSwitchingCompleted );
+    isFirstCycleNotDone = ( FALSE == isFirstCycleBCSwitchingCompleted ) && ( currentBalChamberSwitchingCounter >= balChamberValveClosePeriod );
 
     if ( FALSE == getBalChamberSwitchingOnlyStatus() )
     {
@@ -934,7 +934,7 @@
 
     // Check switching cycle time or pressure check for valve closure
     isBothFillsComplete = ( TRUE == isSpentFillComplete ) && ( TRUE == isPressureStabilizedDuringFill );
-    isFirstCycleNotDone = ( FALSE == isFirstCycleBCSwitchingCompleted );
+    isFirstCycleNotDone = ( FALSE == isFirstCycleBCSwitchingCompleted ) && ( currentBalChamberSwitchingCounter >= balChamberValveClosePeriod );
 
     if ( FALSE == getBalChamberSwitchingOnlyStatus() )
     {