Index: firmware/App/Controllers/TemperatureSensors.c
===================================================================
diff -u -rd325999b7b3ea03b7e294cb8a0b97df93812fbe9 -r316368374c18744558092bdf959a2fd6a4e5574b
--- firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision d325999b7b3ea03b7e294cb8a0b97df93812fbe9)
+++ firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 316368374c18744558092bdf959a2fd6a4e5574b)
@@ -413,14 +413,18 @@
  *************************************************************************/
 void checkInletWaterTemperature( void )
 {
+    F32 temperature             = getTemperatureValue( TEMPSENSORS_INLET_PRIMARY_HEATER );
+
+    if ( VALVE_STATE_OPEN == getValveStateName( VPI ) )
+    {
+
 #ifndef _RELEASE_
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_WATER_QUALITY_CHECK ) != SW_CONFIG_ENABLE_VALUE )
 #endif
     {
         if ( getTestConfigStatus( TEST_CONFIG_DISABLE_INLET_WATER_TEMP_CHECK ) != TRUE )
         {
             DG_OP_MODE_T opMode         = getCurrentOperationMode();
-            F32 temperature             = getTemperatureValue( TEMPSENSORS_INLET_PRIMARY_HEATER );
             BOOL isWaterTempInHighRange = ( temperature > MAX_WATER_TEMPERATURE_WARNING_HIGH_RANGE ? TRUE : FALSE );
             BOOL isWaterTempInLowRange  = ( temperature < MIN_WATER_TEMPERATURE_WARNING_LOW_RANGE ? TRUE : FALSE );
 
@@ -455,15 +459,12 @@
                 case DG_MODE_CHEM:
                 case DG_MODE_CHFL:
                 case DG_MODE_ROPS:
-                    if ( VALVE_STATE_OPEN == getValveStateName( VPI ) )
-                    {
-                        isWaterTempInHighRange = ( temperature > MAX_CLEANING_MODE_WATER_TEMPERATURE_WARNING_HIGH_RANGE ? TRUE : FALSE );
-                        // Per PRS 557
-                        checkPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_TEMP_TOO_HIGH, isWaterTempInHighRange, temperature,
-                                              MAX_WATER_TEMPERATURE_WARNING_HIGH_RANGE );
-                        checkPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_TEMP_TOO_LOW, isWaterTempInLowRange, temperature,
-                                              MAX_WATER_TEMPERATURE_WARNING_LOW_RANGE );
-                    }
+                    isWaterTempInHighRange = ( temperature > MAX_CLEANING_MODE_WATER_TEMPERATURE_WARNING_HIGH_RANGE ? TRUE : FALSE );
+                    // Per PRS 557
+                    checkPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_TEMP_TOO_HIGH, isWaterTempInHighRange, temperature,
+                                          MAX_WATER_TEMPERATURE_WARNING_HIGH_RANGE );
+                    checkPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_TEMP_TOO_LOW, isWaterTempInLowRange, temperature,
+                                          MAX_WATER_TEMPERATURE_WARNING_LOW_RANGE );
                     break;
 
                 default:
@@ -472,6 +473,19 @@
             }
         }
     }
+    }
+    else
+    {
+        // VPI is closed - clear all alarms
+        checkPersistentAlarm( ALARM_ID_DG_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE, FALSE, temperature,
+                              MAX_WATER_TEMPERATURE_WARNING_HIGH_RANGE );
+        checkPersistentAlarm( ALARM_ID_DG_INLET_WATER_TEMPERATURE_IN_LOW_RANGE, FALSE, temperature,
+                              MIN_WATER_TEMPERATURE_WARNING_LOW_RANGE );
+        checkPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_TEMP_TOO_HIGH, FALSE, temperature,
+                              MAX_WATER_TEMPERATURE_WARNING_HIGH_RANGE );
+        checkPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_TEMP_TOO_LOW, FALSE, temperature,
+                              MAX_WATER_TEMPERATURE_WARNING_LOW_RANGE );
+    }
 }
 
 /*********************************************************************//**