Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -rd325999b7b3ea03b7e294cb8a0b97df93812fbe9 -r316368374c18744558092bdf959a2fd6a4e5574b
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision d325999b7b3ea03b7e294cb8a0b97df93812fbe9)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 316368374c18744558092bdf959a2fd6a4e5574b)
@@ -326,12 +326,15 @@
  *************************************************************************/
 void checkInletWaterConductivity( void )
 {
+    F32 conductivity      = getConductivityValue( CONDUCTIVITYSENSORS_CPI_SENSOR );
+
+    if ( VALVE_STATE_OPEN == getValveStateName( VPI ) )
+    {
 #ifndef _RELEASE_
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_WATER_QUALITY_CHECK ) != SW_CONFIG_ENABLE_VALUE )
 #endif
     {
         DG_OP_MODE_T opMode   = getCurrentOperationMode();
-        F32 conductivity      = getConductivityValue( CONDUCTIVITYSENSORS_CPI_SENSOR );
         BOOL isConductTooLow  = FALSE;
         BOOL isConductTooHigh = FALSE;
 
@@ -382,20 +385,26 @@
             case DG_MODE_CHEM:
             case DG_MODE_CHFL:
             case DG_MODE_ROPS:
-                if ( VALVE_STATE_OPEN == getValveStateName( VPI ) )
-                {
-                    // Per PRS 403
-                    checkPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_COND_TOO_HIGH, isConductTooHigh, conductivity, MAX_COND_SENSOR_CPI_WARNING_HIGH_US_PER_CM );
-                    // Per PRS 404
-                    checkPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_COND_TOO_LOW, isConductTooLow, conductivity, MAX_COND_SENSOR_CPI_WARNING_LOW_US_PER_CM );
-                }
+                // Per PRS 403
+                checkPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_COND_TOO_HIGH, isConductTooHigh, conductivity, MAX_COND_SENSOR_CPI_WARNING_HIGH_US_PER_CM );
+                // Per PRS 404
+                checkPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_COND_TOO_LOW, isConductTooLow, conductivity, MAX_COND_SENSOR_CPI_WARNING_LOW_US_PER_CM );
                 break;
 
             default:
                 // NOTE: Do nothing for the rest of the modes
                 break;
         }
     }
+    }
+    else
+    {
+        // VPI is closed - clear all alarms
+        checkPersistentAlarm( ALARM_ID_DG_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE, FALSE, conductivity, MAX_COND_SENSOR_CPI_WARNING_LOW_US_PER_CM );
+        checkPersistentAlarm( ALARM_ID_DG_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE, FALSE, conductivity, MAX_COND_SENSOR_CPI_WARNING_HIGH_US_PER_CM );
+        checkPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_COND_TOO_HIGH, FALSE, conductivity, MAX_COND_SENSOR_CPI_WARNING_HIGH_US_PER_CM );
+        checkPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_COND_TOO_LOW, FALSE, conductivity, MAX_COND_SENSOR_CPI_WARNING_LOW_US_PER_CM );
+    }
 }
 
 /*********************************************************************//**