Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -rbd896114f304304a7096b30b2a85067a64645e82 -r58e5721497be626929b6cdc0c5187e18b34bbaad
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision bd896114f304304a7096b30b2a85067a64645e82)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 58e5721497be626929b6cdc0c5187e18b34bbaad)
@@ -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: