Index: firmware/App/Modes/ModeDrain.c
===================================================================
diff -u -rcea079b61dbd17b2ddaec99b1124248147d14e72 -r6190a4ad94521b74164f1e1fbd79ed359c7c27fb
--- firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision cea079b61dbd17b2ddaec99b1124248147d14e72)
+++ firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision 6190a4ad94521b74164f1e1fbd79ed359c7c27fb)
@@ -164,14 +164,8 @@
         setDrainPumpTargetRPM( 0 );
 
 #ifndef V_2_SYSTEM
-        if ( DG_RESERVOIR_1 == inactiveReservoir )
-        {
-            setValveState( VRD1, VALVE_STATE_CLOSED );
-        }
-        else if ( DG_RESERVOIR_2 == inactiveReservoir )
-        {
-            setValveState( VRD2, VALVE_STATE_CLOSED );
-        }
+        setValveState( VRD1, VALVE_STATE_CLOSED );
+        setValveState( VRD2, VALVE_STATE_CLOSED );
 #endif
 
         if ( TRUE == isReservoirTarePending() )
@@ -205,11 +199,6 @@
         drainEmptyTareTimerCtr = 0;
         tareLoadCellsAtEmpty( inactiveReservoir );
         requestNewOperationMode( DG_MODE_CIRC );
-
-#ifndef V_2_SYSTEM
-        setValveState( VRD1, VALVE_STATE_CLOSED );
-        setValveState( VRD2, VALVE_STATE_CLOSED );
-#endif
     }
 
     return result;