Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -rc2fe204db1b8926994b5eee78afa1b516c97d02c -r67021fbc633259e8e1bce76749dbef7d0cb51998
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision c2fe204db1b8926994b5eee78afa1b516c97d02c)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 67021fbc633259e8e1bce76749dbef7d0cb51998)
@@ -164,7 +164,9 @@
                 activeReservoir.data = (U32)resID;
                 cmdResponse.rejected = FALSE;
                 setValveState( VRF, VALVE_STATE_R2_C_TO_NO );
-#ifdef V_2_SYSTEM
+#ifndef V_2_SYSTEM
+                setValveState( VRD1, VALVE_STATE_CLOSED );
+#else
                 setValveState( VRD, VALVE_STATE_R2_C_TO_NO );
 #endif
                 setValveState( VRO, VALVE_STATE_R1_C_TO_NO );
@@ -174,8 +176,10 @@
             case DG_RESERVOIR_2:
                 activeReservoir.data = (U32)resID;
                 cmdResponse.rejected = FALSE;
-                setValveState( VRF, VALVE_STATE_R1_C_TO_NC );
-#ifdef V_2_SYSTEM
+                setValveState( VRF, VALVE_STATE_R1_C_TO_NC );
+#ifndef V_2_SYSTEM
+                setValveState( VRD2, VALVE_STATE_CLOSED );
+#else
                 setValveState( VRD, VALVE_STATE_R1_C_TO_NC );
 #endif
                 setValveState( VRO, VALVE_STATE_R2_C_TO_NC );