Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -rbe027f8c9bee75f07267f7a9ab5635bbb02df86e -re66245baae86e539e8470aa9739a99a2146d5f17
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision be027f8c9bee75f07267f7a9ab5635bbb02df86e)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision e66245baae86e539e8470aa9739a99a2146d5f17)
@@ -115,19 +115,33 @@
             case RESERVOIR_1:
                 activeReservoir.data = (U32)resID;
                 result = TRUE;
+#ifndef BETA_V1_BUILD
+                setValveState( VRF, VALVE_STATE_R2_C_TO_NO );
+                setValveState( VRD, VALVE_STATE_R2_C_TO_NO );
+                setValveState( VRO, VALVE_STATE_R1_C_TO_NO );
+                setValveState( VRI, VALVE_STATE_R1_C_TO_NO );
+#else
                 setValveState( VRF, VALVE_STATE_R1_C_TO_NC );       // TODO - valve states are reversed for the two reservoirs for now - revert back when load cells are fixed.
                 setValveState( VRD, VALVE_STATE_R1_C_TO_NC );
                 setValveState( VRO, VALVE_STATE_R2_C_TO_NC );
                 setValveState( VRI, VALVE_STATE_R2_C_TO_NC );
+#endif
                 break;
 
             case RESERVOIR_2:
                 activeReservoir.data = (U32)resID;
                 result = TRUE;
+#ifndef BETA_V1_BUILD
+                setValveState( VRF, VALVE_STATE_R1_C_TO_NC );       // TODO - valve states are reversed for the two reservoirs for now - revert back when load cells are fixed.
+                setValveState( VRD, VALVE_STATE_R1_C_TO_NC );
+                setValveState( VRO, VALVE_STATE_R2_C_TO_NC );
+                setValveState( VRI, VALVE_STATE_R2_C_TO_NC );
+#else
                 setValveState( VRF, VALVE_STATE_R2_C_TO_NO );
                 setValveState( VRD, VALVE_STATE_R2_C_TO_NO );
                 setValveState( VRO, VALVE_STATE_R1_C_TO_NO );
                 setValveState( VRI, VALVE_STATE_R1_C_TO_NO );
+#endif
                 break;
 
             default: