Index: firmware/App/Drivers/ConductivitySensors.c
===================================================================
diff -u -r336f6c49e05f515ca1250e0fd9ea97e5f5b5f11c -r94691a0258fe496cfcdc4aaeaa2a5efba4a843ba
--- firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 336f6c49e05f515ca1250e0fd9ea97e5f5b5f11c)
+++ firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 94691a0258fe496cfcdc4aaeaa2a5efba4a843ba)
@@ -554,7 +554,10 @@
         {
             if ( ++conductivitySensorStatus[ sensorId ].interalCondErrorCount > MAX_ALLOWED_UNCHANGED_CONDUCTIVITY_READS )
             {
+                //TODO: restore once conductivity sensor are calibrated and working
+#ifndef __CONDUCTIVITY_SENSOR_ALARMS_DISABLED__
                 SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, sensorId )
+#endif
             }
         }
 
@@ -567,15 +570,21 @@
         {
             if ( ++conductivitySensorStatus[ sensorId ].interalTempErrorCount > MAX_ALLOWED_UNCHANGED_CONDUCTIVITY_READS )
             {
+                //TODO: restore once conductivity sensor are calibrated and working
+#ifndef __CONDUCTIVITY_SENSOR_ALARMS_DISABLED__
                 SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, sensorId )
+#endif
             }
         }
     }
     else
     {
         if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_FPGA_CONDUCTIVITY_SENSOR_ERROR ) )
         {
+            //TODO: restore once conductivity sensor are calibrated and working
+#ifndef __CONDUCTIVITY_SENSOR_ALARMS_DISABLED__
             SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, sensorId )
+#endif
         }
     }
 }
@@ -692,7 +701,10 @@
     // Alarm if any data is out of range.
     if ( FALSE == result )
     {
+        //TODO: restore once conductivity sensor are calibrated and working
+#ifndef __CONDUCTIVITY_SENSOR_ALARMS_DISABLED__
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, sensorId, ( U32 )idx )
+#endif
     }
 
     return result;