Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -r1cd9bf024ebcb865fbab3eeb8dc987b8a3c89f6a -r27e8758fa6199e72b914e1199786a4396ce74d06
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 1cd9bf024ebcb865fbab3eeb8dc987b8a3c89f6a)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 27e8758fa6199e72b914e1199786a4396ce74d06)
@@ -1,17 +1,17 @@
 /**************************************************************************
 *
-* Copyright (c) 2024-2024 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2024-2025 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    ModeGenDialysate.c
 *
 * @author  (last)      Vinayakam Mani
-* @date    (last)      30-Oct-2024
+* @date    (last)      14-Nov-2025
 *
 * @author  (original)  Vinayakam Mani
-* @date    (original)  30-Oct-2024
+* @date    (original)  06-Nov-2024
 *
 ***************************************************************************/
 
@@ -216,9 +216,11 @@
             setValveState( D35_VALV, VALVE_STATE_CLOSED );  // VDI
             setValveState( D40_VALV, VALVE_STATE_CLOSED );  // VDO
             setValveState( D47_VALV, VALVE_STATE_CLOSED );  // spent chamber purge valve
-            setValveState( D64_VALV, VALVE_STATE_CLOSED );
             setValveState( D34_VALV, VALVE_STATE_OPEN );    // Bypass valve
+#ifndef __DRY_BICARB__
             setValveState( D80_VALV, VALVE_STATE_OPEN );    // Bicarb valve
+            setValveState( D64_VALV, VALVE_STATE_CLOSED );
+#endif
 
             // Turn on the primary heater
             calculateTargetDialysateTemp();
@@ -245,7 +247,6 @@
         case DD_GEND_DIALYSATE_DELIVERY_STATE:
             //Previous state
             setValveState( D47_VALV, VALVE_STATE_CLOSED );  // spent chamber purge valve
-            setValveState( D64_VALV, VALVE_STATE_CLOSED );
             setValveState( D14_VALV, VALVE_STATE_OPEN );
             setValveState( D53_VALV, VALVE_STATE_OPEN );    // Drain valve
 
@@ -267,7 +268,10 @@
             setValveState( D34_VALV, VALVE_STATE_CLOSED );  // Bypass valve
             setValveState( D35_VALV, VALVE_STATE_OPEN );    // VDI
             setValveState( D40_VALV, VALVE_STATE_OPEN );    // VDO
+#ifndef __DRY_BICARB__
             setValveState( D80_VALV, VALVE_STATE_OPEN );    // Bicarb valve
+            setValveState( D64_VALV, VALVE_STATE_CLOSED );
+#endif
             break;
 
         case DD_GEND_SPENT_CHAMBER_FILL_STATE:
@@ -277,7 +281,10 @@
             setValveState( D14_VALV, VALVE_STATE_OPEN );
             setValveState( D53_VALV, VALVE_STATE_OPEN );    // Drain valve
             setValveState( D34_VALV, VALVE_STATE_OPEN );    // Bypass valve
+#ifndef __DRY_BICARB__
             setValveState( D80_VALV, VALVE_STATE_OPEN );    // Bicarb valve
+            setValveState( D64_VALV, VALVE_STATE_CLOSED );
+#endif
             setValveState( D47_VALV, VALVE_STATE_OPEN );    // Spent chamber purge valve
 
             requestConcentratePumpOff( D76_PUMP, FALSE );
@@ -313,8 +320,10 @@
 
             setValveState( D53_VALV, VALVE_STATE_OPEN );    // Drain valve
             setValveState( D34_VALV, VALVE_STATE_OPEN );    // Bypass valve
-            setValveState( D64_VALV, VALVE_STATE_OPEN );    // Bicarb chamber purge valve
+#ifndef __DRY_BICARB__
             setValveState( D80_VALV, VALVE_STATE_OPEN );    // Bicarb valve
+            setValveState( D64_VALV, VALVE_STATE_OPEN );    // Bicarb chamber purge valve
+#endif
             bicarbFillStartTimeMS = getMSTimerCount();
 
             // Turn on the primary heater
@@ -353,7 +362,6 @@
             setValveState( D40_VALV, VALVE_STATE_CLOSED );
             setValveState( D31_VALV, VALVE_STATE_CLOSED );
             setValveState( D47_VALV, VALVE_STATE_CLOSED );
-            setValveState( D64_VALV, VALVE_STATE_CLOSED );
             setValveState( D54_VALV, VALVE_STATE_CLOSED );
             setValveState( D14_VALV, VALVE_STATE_CLOSED );
             setValveState( D52_VALV, VALVE_STATE_CLOSED );
@@ -365,7 +373,10 @@
 
             setValveState( D34_VALV, VALVE_STATE_OPEN );
             setValveState( D53_VALV, VALVE_STATE_OPEN );
+#ifndef __DRY_BICARB__
             setValveState( D80_VALV, VALVE_STATE_OPEN );
+            setValveState( D64_VALV, VALVE_STATE_CLOSED );
+#endif
             break;
 
         case DD_GEND_ISOLATED_UF_STATE: