Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -rc914eb443ee2679eb9fe3668119058ccc578437d -rc4c90551130d037cdf7ea7494d9e4877010e2999
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision c914eb443ee2679eb9fe3668119058ccc578437d)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision c4c90551130d037cdf7ea7494d9e4877010e2999)
@@ -445,8 +445,7 @@
 
         // 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 );
         setDrainPumpTargetRPM( DRAIN_PUMP_TARGET_RPM );
@@ -504,10 +503,11 @@
         }
         else
         {
+            tareLoadCell( LOAD_CELL_RESERVOIR_1_PRIMARY );
+            tareLoadCell( LOAD_CELL_RESERVOIR_1_BACKUP );
+
             // Assume reservoir 2 is full and drain it
             rsrvr2Status = DG_RESERVOIR_ABOVE_TARGET;
-            // Request a tare for reservoir 2
-            tareReservoir();
 
             // Done with draining R1, close it
             setValveState( VRD1, VALVE_STATE_CLOSED );
@@ -559,6 +559,9 @@
         }
         else
         {
+            tareLoadCell( LOAD_CELL_RESERVOIR_2_PRIMARY );
+            tareLoadCell( LOAD_CELL_RESERVOIR_2_BACKUP );
+
             signalDrainPumpHardStop();
 
             // Done with draining R2, close it