Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -r6e57ef369518a71692b8631dda5204efce51676c -r150a74dc4d92472352d14934b4359c4bf7e7450a
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 6e57ef369518a71692b8631dda5204efce51676c)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 150a74dc4d92472352d14934b4359c4bf7e7450a)
@@ -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"
@@ -325,8 +326,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 )