Index: firmware/App/Controllers/LoadCell.c
===================================================================
diff -u -r4bd3bf3483660050d3026f7f9adff43782bfc620 -r653b4ae464ae55ff933bdbae630076d174e4f02f
--- firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision 4bd3bf3483660050d3026f7f9adff43782bfc620)
+++ firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision 653b4ae464ae55ff933bdbae630076d174e4f02f)
@@ -49,7 +49,7 @@
 #define LOAD_CELL_MIN_ALLOWED_WEIGHT_BEFORE_TARE_GRAMS          1600.0F                               ///< Load cell minimum allowed weight before tare in grams.
 #define LOAD_CELL_WEIGHT_OUT_RANGE_PERSISTENT_PERIOD_MS         (5 * MS_PER_SECOND)                   ///< Load cell weight out of range persistent period in milliseconds.
 #define LOAD_CELL_PRIMARY_BACKUP_MAX_DRIFT_PERSISTENT_PERIOD_MS (5 * MS_PER_SECOND)                   ///< Load cell primary and backup maximum allowed weight drift persistent period in milliseconds.
-#define EMPTY_RESERVOIR_WEIGHT_GRAMS                            1600.0F                               ///< Reservoirs empty weight in grams.
+#define EMPTY_RESERVOIR_WEIGHT_GRAMS                            1700.0F                               ///< Reservoirs empty weight in grams.
 #define MAX_ALLOWED_EXTRA_WEIGHT_BEFORE_FIRST_TARE_GRAMS        300.0F                                ///< Max allowed extra weight before first tare in grams.
 #define HEAT_ACTIVE_COOL_MAX_ALLOWED_EXTRA_WEIGHT_TARE_GRAMS    200.0F                                ///< Heat disinfect active cool max allowed weight before tare in grams.
 #define MAX_ALLOWED_EXTRA_WEIGHT_BEFORE_TARE_GRAMS              60.0F                                 ///< Max allowed extra weight before tare in grams.
@@ -122,7 +122,7 @@
         loadcells[ i ].weight.ovData                  = 0.0F;
         loadcells[ i ].weight.ovInitData              = 0.0F;
         loadcells[ i ].weight.override                = OVERRIDE_RESET;
-        loadcells[ i ].autoCalOffset                  = 0.0F;
+        loadcells[ i ].autoCalOffset                  = EMPTY_RESERVOIR_WEIGHT_GRAMS;
         loadcells[ i ].largeFilterTotal               = 0.0F;
         loadcells[ i ].largeFilteredWeight            = 0.0F;
         loadcells[ i ].smallFilterTotal               = 0.0F;
@@ -206,10 +206,10 @@
                             NUM_OF_CAL_DATA_LOAD_CELLS, ALARM_ID_DG_LOAD_CELLS_INVALID_CAL_RECORD );
 
         // Zero the current tare values when new calibration data is available
-        loadcells[ LOAD_CELL_RESERVOIR_1_PRIMARY ].autoCalOffset = 0.0F;
-        loadcells[ LOAD_CELL_RESERVOIR_1_BACKUP ].autoCalOffset  = 0.0F;
-        loadcells[ LOAD_CELL_RESERVOIR_2_PRIMARY ].autoCalOffset = 0.0F;
-        loadcells[ LOAD_CELL_RESERVOIR_2_BACKUP ].autoCalOffset  = 0.0F;
+        loadcells[ LOAD_CELL_RESERVOIR_1_PRIMARY ].autoCalOffset = EMPTY_RESERVOIR_WEIGHT_GRAMS;
+        loadcells[ LOAD_CELL_RESERVOIR_1_BACKUP ].autoCalOffset  = EMPTY_RESERVOIR_WEIGHT_GRAMS;
+        loadcells[ LOAD_CELL_RESERVOIR_2_PRIMARY ].autoCalOffset = EMPTY_RESERVOIR_WEIGHT_GRAMS;
+        loadcells[ LOAD_CELL_RESERVOIR_2_BACKUP ].autoCalOffset  = EMPTY_RESERVOIR_WEIGHT_GRAMS;
     }
 
     // Rolling average of last 100 raw samples in small filter
@@ -358,11 +358,9 @@
     // Check if the load cell is being tared for the first time
     if ( hasLoadCellBeenTared[ loadCellID ] != TRUE )
     {
-        // For the first tare, the weight of the reservoir should be considered
+        // For the first tare, the weight of the reservoir should be considered so the weight tolerance is bigger
         // The current weight of the load cell should not be greater than the weight of the reservoir + the extra weight
-        F32 deltaWeight = fabs( weight - EMPTY_RESERVOIR_WEIGHT_GRAMS );
-
-        isWeightOutOfRange = ( deltaWeight > MAX_ALLOWED_EXTRA_WEIGHT_BEFORE_FIRST_TARE_GRAMS ? TRUE : FALSE );
+        isWeightOutOfRange = ( weight > MAX_ALLOWED_EXTRA_WEIGHT_BEFORE_FIRST_TARE_GRAMS ? TRUE : FALSE );
     }
     else
     {