Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -r05718e4bf876a8b7eb5e04ccdeace451cd864f56 -r5998ba73451420956f1c22a207d640651f4544cf
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 05718e4bf876a8b7eb5e04ccdeace451cd864f56)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 5998ba73451420956f1c22a207d640651f4544cf)
@@ -24,6 +24,7 @@
 #include "ModeFill.h"
 #include "OperationModes.h"
 #include "PersistentAlarm.h"
+#include "Reservoirs.h"
 #include "SystemCommMessages.h"
 #include "TaskGeneral.h"
 #include "TaskPriority.h"
@@ -327,8 +328,11 @@
 void checkInletWaterConductivity( void )
 {
     F32 conductivity = getConductivityValue( CONDUCTIVITYSENSORS_CPI_SENSOR );
+    HD_MODE_SUB_MODE_T opMode;
+    getHDOperationMode( &opMode );
 
-    if ( VALVE_STATE_OPEN == getValveStateName( VPI ) )
+
+    if ( VALVE_STATE_OPEN == getValveStateName( VPI ) && ( opMode.hdMode <= MODE_TREA ) )
     {
 #ifndef _RELEASE_
         if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_WATER_QUALITY_CHECK ) != SW_CONFIG_ENABLE_VALUE )