Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -rf554e391302359aa2b252c6c13603d831c11cb77 -r8cc2ab43a8f0f051dd0ccb2a4768c0b12f4e44bc
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision f554e391302359aa2b252c6c13603d831c11cb77)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 8cc2ab43a8f0f051dd0ccb2a4768c0b12f4e44bc)
@@ -162,6 +162,8 @@
 {
     initGenDialysateMode();
     setCurrentSubState( NO_SUB_STATE );
+    // Deactivate Balancing Chamber Switching
+    requestBalChamberSwitching( FALSE );
     transitionToUltrafiltration();
 
     return genDialysateState;
@@ -207,6 +209,9 @@
     switch( state )
     {
         case DD_GEND_STATE_START:
+            // Deactivate Balancing Chamber Switching
+            requestBalChamberSwitching( FALSE );
+
             // Do nothing
             break;
 
@@ -256,13 +261,18 @@
             setRinsePumpState( RINSE_PUMP_STATE_ON );
 
             transitionToBalChamberFill();
+            // Activate Balancing Chamber Switching
+            requestBalChamberSwitching( TRUE );
 
             //Testing
             bypassStateDelayStartTimeMS = getMSTimerCount();
             delayBypassStateFlag        = TRUE;
             break;
 
         case DD_GEND_DIALYSATE_DELIVERY_STATE:
+            // Activate Balancing Chamber Switching
+            requestBalChamberSwitching( TRUE );
+
             //Previous state
             setValveState( D47_VALV, VALVE_STATE_CLOSED );  // spent chamber purge valve
             setValveState( D8_VALV, VALVE_STATE_CLOSED );
@@ -311,6 +321,9 @@
             break;
 
         case DD_GEND_SPENT_CHAMBER_FILL_STATE:
+            // Deactivate Balancing Chamber Switching
+            requestBalChamberSwitching( FALSE );
+
             //Set valves and actuators
             setValveState( D35_VALV, VALVE_STATE_CLOSED );  // VDI
             setValveState( D40_VALV, VALVE_STATE_CLOSED );  // VDO
@@ -354,6 +367,9 @@
             break;
 
         case DD_GEND_BICARB_CHAMBER_FILL_STATE:
+            // Deactivate Balancing Chamber Switching
+            requestBalChamberSwitching( FALSE );
+
             requestConcentratePumpOff( D11_PUMP, FALSE );
             requestConcentratePumpOff( D10_PUMP, FALSE );
             requestConcentratePumpOff( D76_PUMP, FALSE );
@@ -390,6 +406,9 @@
             break;
 
         case DD_GEND_DIALYSATE_DELIVERY_PAUSE:
+            // Deactivate Balancing Chamber Switching
+            requestBalChamberSwitching( FALSE );
+
             setDialysatePumpTargetRPM( D12_PUMP, FRESH_DIAL_PUMP_INITIAL_RPM, TRUE );
             signalDialysatePumpHardStop( D48_PUMP );
             requestConcentratePumpOff( D11_PUMP, FALSE );
@@ -431,6 +450,8 @@
             break;
 
         case DD_GEND_ISOLATED_UF_STATE:
+            // Deactivate Balancing Chamber Switching
+            requestBalChamberSwitching( FALSE );
             //TODO : define actuators states
             break;
 
@@ -653,11 +674,6 @@
             delayBypassStateFlag = FALSE;
         }
     }
-    else
-    {
-        //Execute balancing chamber
-        execBalancingChamberControl();
-    }
 
     if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_SPENT_CHAMBER_H_FILL ) == TRUE )
     {
@@ -734,9 +750,6 @@
 #endif
     else
     {
-        //Execute balancing chamber
-        execBalancingChamberControl();
-
         //Execute ultrafiltration
         execUFControl();
     }