Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -r1cd9bf024ebcb865fbab3eeb8dc987b8a3c89f6a -r65292e443646d135d8fcad0a2eda19d844b06dff
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 1cd9bf024ebcb865fbab3eeb8dc987b8a3c89f6a)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 65292e443646d135d8fcad0a2eda19d844b06dff)
@@ -218,7 +218,9 @@
             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
+#endif
 
             // Turn on the primary heater
             calculateTargetDialysateTemp();
@@ -267,7 +269,9 @@
             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
+#endif
             break;
 
         case DD_GEND_SPENT_CHAMBER_FILL_STATE:
@@ -277,7 +281,9 @@
             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
+#endif
             setValveState( D47_VALV, VALVE_STATE_OPEN );    // Spent chamber purge valve
 
             requestConcentratePumpOff( D76_PUMP, FALSE );
@@ -314,7 +320,9 @@
             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
+#endif
             bicarbFillStartTimeMS = getMSTimerCount();
 
             // Turn on the primary heater
@@ -365,7 +373,9 @@
 
             setValveState( D34_VALV, VALVE_STATE_OPEN );
             setValveState( D53_VALV, VALVE_STATE_OPEN );
+#ifndef __DRY_BICARB__
             setValveState( D80_VALV, VALVE_STATE_OPEN );
+#endif
             break;
 
         case DD_GEND_ISOLATED_UF_STATE: