Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r2326a384932d92d970f9ec46c1dc1e8881b8bc8d -r28b5f2e7f757647145a82a39aca0a5f3652c68a1
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 2326a384932d92d970f9ec46c1dc1e8881b8bc8d)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 28b5f2e7f757647145a82a39aca0a5f3652c68a1)
@@ -89,6 +89,7 @@
 #define RSRVRS_MIX_DRAIN_TIMEOUT_MS                ( 20 * SEC_PER_MIN * MS_PER_SECOND )                        ///< Reservoirs 1 & 2 mix drain timeout in ms.
 #define DRAIN_PUMP_START_TIME_IN_MIX_DRAIN_MS      ( 5 * MS_PER_SECOND )                                       ///< Time to start the drain pump at mix drain after directing the flow to drain in ms.
 #define DRAIN_PUMP_RPM_IN_MIX_DRAIN              600                                                           ///< The RPM that the drain pump should be run during mix drain.
+#define MIX_DRAIN_WEIGHT_UNCHANGE_TIMEOUT          ( 15 * MS_PER_SECOND )                                      ///< Time period of unchanged weight during mix draining before timeout.
 
 // Rinse R1 to R2
 #define ROF_MIN_LOW_PRESSURE_TEMPERATURE_C      45.0                                                           ///< RO filter minimum temperature that the pressure must be no more than 30psi in C. TODO the actual value is 45.0
@@ -1192,7 +1193,7 @@
 {
     DG_HEAT_DISINFECT_STATE_T state = DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R1;
 
-    if ( TRUE == didTimeout( stateTimer, DRAIN_PUMP_START_TIME_IN_MIX_DRAIN_MS ) && isDrainPumpInMixDrainOn == FALSE )
+    if ( ( TRUE == didTimeout( stateTimer, DRAIN_PUMP_START_TIME_IN_MIX_DRAIN_MS ) ) && ( isDrainPumpInMixDrainOn == FALSE ) )
     {
         isDrainPumpInMixDrainOn = TRUE;
 
@@ -1203,7 +1204,7 @@
     {
         if ( DG_RESERVOIR_ABOVE_TARGET == rsrvr1Status )
         {
-            rsrvr1Status = getRsrvrDrainStatus( DG_RESERVOIR_1, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_MIX_DRAIN_TIMEOUT_MS );
+            rsrvr1Status = getRsrvrDrainStatus( DG_RESERVOIR_1, MIX_DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_MIX_DRAIN_TIMEOUT_MS );
         }
         else if ( DG_RESERVOIR_REACHED_TARGET == rsrvr1Status )
         {
@@ -1240,7 +1241,7 @@
 
     if ( DG_RESERVOIR_ABOVE_TARGET == rsrvr2Status )
     {
-        rsrvr2Status = getRsrvrDrainStatus( DG_RESERVOIR_2, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_MIX_DRAIN_TIMEOUT_MS );
+        rsrvr2Status = getRsrvrDrainStatus( DG_RESERVOIR_2, MIX_DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_MIX_DRAIN_TIMEOUT_MS );
     }
     else if ( DG_RESERVOIR_REACHED_TARGET == rsrvr2Status )
     {