Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -r7d4711edd7b40cd3e29f43e766f79a8a09586fe9 -r6aeb55fc06ec5d67c24596986a22d909bfc91943
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 7d4711edd7b40cd3e29f43e766f79a8a09586fe9)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 6aeb55fc06ec5d67c24596986a22d909bfc91943)
@@ -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"
@@ -317,18 +318,19 @@
 /*********************************************************************//**
  * @brief
  * The checkInletWaterConductivity function checks inlet water conductivity value
- * and triggers an alarm when conductivity value is not within the specified
- * values.
+ * and triggers an alarm when conductivity value is out of allowed range.
  * @details Inputs: CPi sensor conductivity
- * @details Outputs: Trigger warning alarm if conductivity is in the warning
- * range. Trigger alarm if conductivity is below minimum conductivity.
+ * @details Outputs: Trigger alarms when conductivity is out of allowed range
  * @return none
  *************************************************************************/
 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 )