Index: firmware/App/Modes/ModeFlush.c
===================================================================
diff -u -rc914eb443ee2679eb9fe3668119058ccc578437d -rc4c90551130d037cdf7ea7494d9e4877010e2999
--- firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision c914eb443ee2679eb9fe3668119058ccc578437d)
+++ firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision c4c90551130d037cdf7ea7494d9e4877010e2999)
@@ -301,9 +301,6 @@
     // Close VPi to prevent wasting water
     setValveState( VPI, VALVE_STATE_CLOSED );
 
-    // Request a tare for reservoir 1
-    tareReservoir();
-
     // Set the actuators to drain R1
     setValveState( VRD1, VALVE_STATE_OPEN );
 
@@ -338,8 +335,8 @@
     {
         if ( TRUE == isThisInitialDrain )
         {
-            // Request a tare for reservoir 2
-            tareReservoir();
+            tareLoadCell( LOAD_CELL_RESERVOIR_1_PRIMARY );
+            tareLoadCell( LOAD_CELL_RESERVOIR_1_BACKUP );
         }
 
         // Close reservoir 1 drain
@@ -384,6 +381,9 @@
 
          if ( TRUE == isThisInitialDrain )
          {
+             tareLoadCell( LOAD_CELL_RESERVOIR_2_PRIMARY );
+             tareLoadCell( LOAD_CELL_RESERVOIR_2_BACKUP );
+
              // Set the actuators to flush drain
              setValveState( VPI, VALVE_STATE_OPEN );
              setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NO );