Index: firmware/App/Modes/ModePreGenDialysate.c
===================================================================
diff -u -r8aa885b17330f096934f175d35912c3c95825039 -r145fd716a856f864f39fb0f9884865f6e45b9256
--- firmware/App/Modes/ModePreGenDialysate.c	(.../ModePreGenDialysate.c)	(revision 8aa885b17330f096934f175d35912c3c95825039)
+++ firmware/App/Modes/ModePreGenDialysate.c	(.../ModePreGenDialysate.c)	(revision 145fd716a856f864f39fb0f9884865f6e45b9256)
@@ -8,13 +8,14 @@
 * @file    ModePreGenDialysate.c
 *
 * @author  (last)      Sameer Kalliadan Poyil
-* @date    (last)      10-Feb-2026
+* @date    (last)      15-Jun-2026
 *
 * @author  (original)  Vinayakam Mani
 * @date    (original)  18-Apr-2025
 *
 ***************************************************************************/
 
+#include "BalancingChamber.h"
 #include "ConcentratePumps.h"
 #include "DialysatePumps.h"
 #include "DryBiCart.h"
@@ -100,6 +101,8 @@
 {
     initPreGenDialysateMode();
     deenergizeActuators( PARK_CONC_PUMPS );
+    // Deactivate Balancing Chamber Switching
+    requestBalChamberSwitching( FALSE );
 
     setCurrentSubState( NO_SUB_STATE );
 
@@ -250,11 +253,12 @@
     DD_PRE_GEN_DIALYSATE_STATE_T state  = DD_PRE_GEN_DRY_BICART_INITIAL_FILL;
 
     // TODO: testing drybicart fill in pre-gen
+#if 0
     if ( getTestConfigStatus( TEST_CONFIG_DD_DRY_BICART_TEST ) == TRUE )
     {
         setBicartFillRequested();
     }
-
+#endif
     //execWetSelfTest();
 
     return state;
@@ -271,7 +275,7 @@
 {
     //TODO: Change to wet self test state later
     DD_PRE_GEN_DIALYSATE_STATE_T state  = DD_PRE_GEN_DRY_BICART_INITIAL_FILL;
-
+#if 0
     // TODO: testing drybicart fill in pre-gen
     if ( getTestConfigStatus( TEST_CONFIG_DD_DRY_BICART_TEST ) == TRUE )
     {
@@ -283,6 +287,7 @@
         // TODO: Alarm if it is not completed within 1.5 minutes
     }
     else
+#endif
     {
         // not bicart fill, move to next state
         state   = DD_PRE_GEN_DIALYSATE_WAIT_FOR_GEND;