Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -rd231742b36c0fcdfd3b2d822bebf5dc8a00729a3 -ra42ea76ae1c0d4db5f88a6d01e7807afc555f33a
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision d231742b36c0fcdfd3b2d822bebf5dc8a00729a3)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision a42ea76ae1c0d4db5f88a6d01e7807afc555f33a)
@@ -287,10 +287,13 @@
     if ( TRUE == activate )
     {
         isBalChamberSwitchingOnRequested = TRUE;
+        isBalChamberSwitchingOffRequested = FALSE;
+
     }
     else
     {
         isBalChamberSwitchingOffRequested = TRUE;
+        isBalChamberSwitchingOnRequested = FALSE;
     }
 }
 
@@ -690,8 +693,10 @@
  * @brief
  * The handleBalChamberState1FillEnd function check for the balancing chamber
  * switching period and tranistion to next state switching.
- * @details \b Inputs: currentBalChamberSwitchingCounter, balChamberSwitchingPeriod
+ * @details \b Inputs: currentBalChamberSwitchingCounter, balChamberSwitchingPeriod,
+ * isBalChamberSwitchingOffRequested
  * @details \b Outputs: balChamberFillPressureDropCounter,balChamberFillCompleteStablePressureCounter
+ * isBalChamberSwitchingOnRequested, isBalChamberSwitchingOffRequested, isBalChamberSwitchingActive
  * @details \b Alarm: ALARM_ID_DD_BC_STATE1_FILL_PRESSURE_DROP_OUT_OF_RANGE
  * when pressure drop is not in range during balacing chamber fill in progress.
  * @details \b Alarm: ALARM_ID_DD_BC_STATE1_FILL_END_PRESSURE_OUT_OF_RANGE
@@ -869,8 +874,10 @@
  * @brief
  * The handleBalChamberState2FillEnd function check for the balancing chamber
  * switching period complete and transition to next state.
- * @details \b Inputs: currentBalChamberSwitchingCounter, balChamberSwitchingPeriod
- * @details \b Outputs: isPressureStabilizedDuringFill,isBalChamberFillInProgress
+ * @details \b Inputs: currentBalChamberSwitchingCounter, balChamberSwitchingPeriod,
+ * isBalChamberSwitchingOffRequested
+ * @details \b Outputs: isPressureStabilizedDuringFill,isBalChamberFillInProgress,
+ * isBalChamberSwitchingOnRequested, isBalChamberSwitchingOffRequested, isBalChamberSwitchingActive
  * @details \b Alarm: ALARM_ID_DD_BC_STATE2_FILL_PRESSURE_DROP_OUT_OF_RANGE
  * when pressure is not in range during balacing chamber state 2 fill in progress.
  * @details \b Alarm: ALARM_ID_DD_BC_STATE2_FILL_END_PRESSURE_OUT_OF_RANGE
@@ -949,7 +956,8 @@
  * @brief
  * The handleBalChamberStateIdle function handles balancing chamber idle state.
  * @details \b Inputs: isBalChamberSwitchingOnRequested
- * @details \b Outputs: isBalChamberSwitchingActive
+ * @details \b Outputs: isBalChamberSwitchingOnRequested, isBalChamberSwitchingOffRequested,
+ * isBalChamberSwitchingActive
  * @return next balancing chamber state.
  *************************************************************************/
 static BAL_CHAMBER_EXEC_STATE_T handleBalChamberStateIdle( void )
Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -rd231742b36c0fcdfd3b2d822bebf5dc8a00729a3 -ra42ea76ae1c0d4db5f88a6d01e7807afc555f33a
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision d231742b36c0fcdfd3b2d822bebf5dc8a00729a3)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision a42ea76ae1c0d4db5f88a6d01e7807afc555f33a)
@@ -211,8 +211,6 @@
         case DD_GEND_STATE_START:
             // Deactivate Balancing Chamber Switching
             requestBalChamberSwitching( FALSE );
-
-            // Do nothing
             break;
 
         case DD_GEND_DIALYSATE_BYPASS_STATE: