Index: firmware/App/Modes/ModeDrain.c
===================================================================
diff -u -r78a138b18328bce8312abac79d76aad9dfe8ea3a -r092b20aaea3defad5e1dbacf5a3f87e67256bd45
--- firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision 78a138b18328bce8312abac79d76aad9dfe8ea3a)
+++ firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision 092b20aaea3defad5e1dbacf5a3f87e67256bd45)
@@ -35,7 +35,8 @@
 
 #define TARGET_DRAIN_PUMP_RPM           1800                                ///< Target drain pump speed (in RPM).
 #define DRAIN_WEIGHT_UNCHANGE_TIMEOUT   ( 2 * MS_PER_SECOND )               ///< Time period of unchanged weight during draining before timeout.
-#define DRAIN_EMPTY_TARE_WAIT           ( MS_PER_SECOND )                   ///< Time period to wait after drain complete and before taring load cells.
+/// Time period to wait after drain complete and before taring load cells.
+#define DRAIN_EMPTY_TARE_WAIT           ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )
 
 #define TARGET_RO_PRESSURE_PSI          130                                 ///< Target pressure for RO pump.
 #define TARGET_RO_FLOW_RATE_L           0.3                                 ///< Target flow rate for RO pump.
Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -r78a138b18328bce8312abac79d76aad9dfe8ea3a -r092b20aaea3defad5e1dbacf5a3f87e67256bd45
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 78a138b18328bce8312abac79d76aad9dfe8ea3a)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 092b20aaea3defad5e1dbacf5a3f87e67256bd45)
@@ -481,8 +481,8 @@
 
 /*********************************************************************//**
  * @brief
- * The tareLoadCellsAtEmpty function tares the load cells for the inactive
- * reservoir when ModeDrain empties it and tare request is pending.
+ * The tareLoadCellsAtEmpty function tares the load cells for the given
+ * reservoir when empty and tare request is pending.
  * @details Inputs: tareLoadCellRequest
  * @details Outputs: tareLoadCellRequest
  * @param reservoirId ID of reservoir to tare