Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r373439d99894364aab253ec864d04c0328480e46 -re5c5360152ef5c8f5a4471282df5399bc7bc825c
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 373439d99894364aab253ec864d04c0328480e46)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision e5c5360152ef5c8f5a4471282df5399bc7bc825c)
@@ -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;