Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r373439d99894364aab253ec864d04c0328480e46 -rcff57d101d8d2fa293b8cc9e17f4bb68e78adf39
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 373439d99894364aab253ec864d04c0328480e46)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision cff57d101d8d2fa293b8cc9e17f4bb68e78adf39)
@@ -292,7 +292,7 @@
     timeStatus[ RO_AT_82_C ].startTempC        = HEAT_DISINFECT_START_TEMP_AT_82_C;
     timeStatus[ RO_AT_82_C ].startTimeMS       = 0;
     timeStatus[ RO_AT_82_C ].stopTempC         = HEAT_DISINFECT_STOP_TEMP_AT_81_C;
-    timeStatus[ RO_AT_82_C ].targetTimeMS      = getU32OverrideValue( &targetTimer82C );;
+    timeStatus[ RO_AT_82_C ].targetTimeMS      = getU32OverrideValue( &targetTimer82C );
     timeStatus[ RO_AT_82_C ].tempSensor        = TEMPSENSORS_HEAT_DISINFECT;
 
     timeStatus[ RSRVR_AT_77_C ].startTempC     = HEAT_DISINFECT_START_TEMP_AT_77_C;
@@ -791,14 +791,14 @@
     // If R1 is not full, keep monitoring for R1 level and timeout
     if ( DG_RESERVOIR_BELOW_TARGET == rsrvr1Status )
     {
+        F32 volumML = getLoadCellSmallFilteredWeight( LOAD_CELL_RESERVOIR_2_PRIMARY );
+
         rsrvr1Status = getRsrvrFillStatus( DG_RESERVOIR_1, RSRVRS_FULL_VOL_ML, RSRVRS_FILL_UP_TIMEOUT_MS );
 
-        // Keep monitoring the status of reservoir 2 at the same time
-        rsrvr2Status = getRsrvrFillStatus( DG_RESERVOIR_2, RSRVRS_PARTIAL_FILL_VOL_ML, RSRVRS_500ML_FILL_UP_TIMEOUT_MS );
         // Reservoir 2 cannot be filled before reservoir 1 is filled and is overflowing to reservoir 2. If reservoir 2 has already
         // reached to target volume, it means reservoir 1's load cell might be reading incorrect values. This situation might continue
         // until reservoir 2 is filled up and the tubing might expand or leak.
-        if ( DG_RESERVOIR_REACHED_TARGET == rsrvr2Status )
+        if ( volumML >= RSRVRS_PARTIAL_FILL_VOL_ML )
         {
             prevHeatDisinfectState      = state;
             alarmDetectedPendingTrigger = ALARM_ID_DG_INVALID_LOAD_CELL_VALUE;
@@ -1712,7 +1712,7 @@
             status                     = DG_RESERVOIR_REACHED_TARGET;
             rsrvrFillStableTimeCounter = 0;
             // Set the state timer in case it needs to be used for another timeout check
-            if ( ( DG_HEAT_DISINFECT_STATE_FLUSH_R2_AND_DRAIN_R1 == heatDisinfectState) && ( DG_RESERVOIR_2 == reservoir ) )
+            if ( ( DG_HEAT_DISINFECT_STATE_FLUSH_R2_AND_DRAIN_R1 == heatDisinfectState ) && ( DG_RESERVOIR_2 == reservoir ) )
             {
                 if ( rsrvr1Status == DG_RESERVOIR_REACHED_TARGET )
                 {
@@ -1956,7 +1956,6 @@
         }
         else if ( TRUE == didTimeout( timeStatus[ disinfectTime ].startTimeMS, timeStatus[ disinfectTime ].targetTimeMS ) )
         {
-
             status = TRUE;
         }
     }