Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -rb1b5e8659de8f6109c4d77cda98308d1fd9ef165 -re6dc73b45ec3d0df4c9a03673625862b71acd608
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision b1b5e8659de8f6109c4d77cda98308d1fd9ef165)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision e6dc73b45ec3d0df4c9a03673625862b71acd608)
@@ -196,8 +196,10 @@
     BOOL const isCondTooHigh = ( conductivity > COND_SENSOR_CPI_MAX_VALUE );
     BOOL const isCondTooLow = ( conductivity < COND_SENSOR_CPI_MIN_VALUE );
 
+#ifndef DISABLE_WATER_QUALITY_CHECK
     checkPersistentAlarm( ALARM_ID_INLET_WATER_HIGH_CONDUCTIVITY, isCondTooHigh, conductivity, COND_SENSOR_CPI_MAX_VALUE );
     checkPersistentAlarm( ALARM_ID_INLET_WATER_LOW_CONDUCTIVITY, isCondTooLow, conductivity, COND_SENSOR_CPI_MIN_VALUE );
+#endif
 }
 
 /*********************************************************************//**