Index: firmware/App/Drivers/ConductivitySensors.c
===================================================================
diff -u -r1c478c1aff953528127767db1f4f747a7f7089c8 -ra2ea8edd918761b403cbe2c00e1bfe2fc69be5ea
--- firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 1c478c1aff953528127767db1f4f747a7f7089c8)
+++ firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision a2ea8edd918761b403cbe2c00e1bfe2fc69be5ea)
@@ -553,7 +553,10 @@
         {
             if ( ++conductivitySensorStatus[ sensorId ].interalCondErrorCount > MAX_ALLOWED_UNCHANGED_CONDUCTIVITY_READS )
             {
-//                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, sensorId )
+                //TODO: restore once conductivity sensor are calibrated and working
+#ifndef ENABLE_ALARM_4
+                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, sensorId )
+#endif
             }
         }
 
@@ -566,15 +569,21 @@
         {
             if ( ++conductivitySensorStatus[ sensorId ].interalTempErrorCount > MAX_ALLOWED_UNCHANGED_CONDUCTIVITY_READS )
             {
-//                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, sensorId )
+                //TODO: restore once conductivity sensor are calibrated and working
+#ifndef ENABLE_ALARM_4
+                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, sensorId )
+#endif
             }
         }
     }
     else
     {
         if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_FPGA_CONDUCTIVITY_SENSOR_ERROR ) )
         {
-//            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, sensorId )
+            //TODO: restore once conductivity sensor are calibrated and working
+#ifndef ENABLE_ALARM_4
+            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, sensorId )
+#endif
         }
     }
 }
@@ -691,7 +700,10 @@
     // Alarm if any data is out of range.
     if ( FALSE == result )
     {
-//        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, sensorId, ( U32 )idx )
+        //TODO: restore once conductivity sensor are calibrated and working
+#ifndef ENABLE_ALARM_4
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, sensorId, ( U32 )idx )
+#endif
     }
 
     return result;