Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -reae0635792a827b7cf9197cf6f6e253f2a094260 -r73c6b6fb7bbb934277157ce1e218358c573a6af1
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision eae0635792a827b7cf9197cf6f6e253f2a094260)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 73c6b6fb7bbb934277157ce1e218358c573a6af1)
@@ -1293,7 +1293,6 @@
         setValveState( VRO, VALVE_STATE_R1_C_TO_NO );
         setValveState( VRI, VALVE_STATE_R1_C_TO_NO );
         setValveState( VRF, VALVE_STATE_R2_C_TO_NO );
-
         signalROPumpHardStop();
 
         rsrvr1Status = DG_RESERVOIR_ABOVE_TARGET;
@@ -1708,21 +1707,18 @@
 static HEAT_DISINFECT_STATUS_T getHeatDisinfectStatus( void )
 {
     HEAT_DISINFECT_STATUS_T status = HEAT_DISINFECT_HEAT_UP_IN_PROGRESS;
+    F32 TPoTemp                    = getTemperatureValue( TEMPSENSORS_OUTLET_PRIMARY_HEATER );
+    F32 ThdTemp                    = getTemperatureValue( TEMPSENSORS_HEAT_DISINFECT );
+    F32 loadCellA1                 = getLoadCellSmallFilteredWeight( LOAD_CELL_RESERVOIR_1_PRIMARY );
+    F32 loadCellB1                 = getLoadCellSmallFilteredWeight( LOAD_CELL_RESERVOIR_2_PRIMARY );
+    BOOL isR1OutOfRange            = ( fabs( loadCellA1 - R1HeatDisinfectVol ) > RSRVRS_MAX_TARGET_VOL_CHANGE_ML ? TRUE : FALSE );
+    BOOL isR2OutOfRange            = ( fabs( loadCellB1 - R2HeatDisinfectVol ) > RSRVRS_MAX_TARGET_VOL_CHANGE_ML ? TRUE : FALSE );
+    BOOL isGradientOutOfRange      = ( fabs( TPoTemp - ThdTemp ) > HEAT_DISINFECT_MAX_TEMP_GRADIENT_C ? TRUE : FALSE );
 
-    F32 TPoTemp = getTemperatureValue( TEMPSENSORS_OUTLET_PRIMARY_HEATER );
-    F32 ThdTemp = getTemperatureValue( TEMPSENSORS_HEAT_DISINFECT );
-
-    BOOL isR1OutOfRange = fabs( getLoadCellSmallFilteredWeight( LOAD_CELL_RESERVOIR_1_PRIMARY ) - R1HeatDisinfectVol ) > RSRVRS_MAX_TARGET_VOL_CHANGE_ML;
-    BOOL isR2OutOfRange = fabs( getLoadCellSmallFilteredWeight( LOAD_CELL_RESERVOIR_2_PRIMARY ) - R2HeatDisinfectVol ) > RSRVRS_MAX_TARGET_VOL_CHANGE_ML;
-
-    // Check if the temperature gradient in between the coldest and the hottest spot is more than the specified temperature and
-    // the timer has not started yet, start it
-    BOOL gradientOutOfRange = ( fabs( TPoTemp - ThdTemp ) > HEAT_DISINFECT_MAX_TEMP_GRADIENT_C ) ? TRUE : FALSE;
-
     // Perform check if no pending alarm
     if ( ALARM_ID_NO_ALARM == alarmDetectedPendingTrigger )
     {
-        if ( TRUE != gradientOutOfRange  )
+        if ( FALSE == isGradientOutOfRange )
         {
             tempGradOutOfRangeTimer = 0;
         }