Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -r19ddae332910253204721af6204594467096f468 -re107dacab9f6c78574f1c26e1004e0dbdc8dba03
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 19ddae332910253204721af6204594467096f468)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision e107dacab9f6c78574f1c26e1004e0dbdc8dba03)
@@ -307,17 +307,17 @@
             case DG_MODE_GENE:
             case DG_MODE_FILL:
             case DG_MODE_DRAI:
-                if ( ( conductivity >= MIN_COND_SENSOR_CPI_WARNING_LOW_US_PER_CM ) && ( TRUE == isAlarmActive( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE ) ) )
+                if ( TRUE == isAlarmActive( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE ) )
                 {
-                    isConductTooLow = FALSE;
+                    isConductTooLow = ( conductivity >= MIN_COND_SENSOR_CPI_WARNING_LOW_US_PER_CM ? FALSE : TRUE );
                 }
 
                 // Per PRS 403
                 checkPersistentAlarm( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE, isConductTooLow, conductivity, MAX_COND_SENSOR_CPI_WARNING_LOW_US_PER_CM );
 
-                if ( ( conductivity <= MIN_COND_SENSOR_CPI_WARNING_HIGH_US_PER_CM ) && ( TRUE == isAlarmActive( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE ) ) )
+                if ( TRUE == isAlarmActive( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE ) )
                 {
-                    isConductTooHigh = FALSE;
+                    isConductTooHigh = ( conductivity <= MIN_COND_SENSOR_CPI_WARNING_HIGH_US_PER_CM ? FALSE : TRUE );
                 }
 
                 // Per PRS 404