Index: firmware/App/Drivers/ConductivitySensors.c
===================================================================
diff -u -r3749d041224897f9da5a1cfadae7bab81d94437b -r4643a4b7f7ecaca8e07a809af6b218fac1c74799
--- firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 3749d041224897f9da5a1cfadae7bab81d94437b)
+++ firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 4643a4b7f7ecaca8e07a809af6b218fac1c74799)
@@ -448,8 +448,17 @@
         // Read all cal values. Check ranges.
         else
         {
-            //conductivitySensorStatus[ sensor ].calReadComplete = checkConductivityCoefficientRanges( sensor );
-            conductivitySensorStatus[ sensor ].calReadComplete = TRUE;
+
+            if ( ( getTestConfigStatus( TEST_CONFIG_FP_DISABLE_CONDUCTIVITY_ALARMS ) == TRUE ) &&
+                 ( getTestConfigStatus( TEST_CONFIG_DD_DISABLE_CONDUCTIVITY_ALARMS ) == TRUE ) )
+            {
+                conductivitySensorStatus[ sensor ].calReadComplete = TRUE;
+            }
+            else
+            {
+                conductivitySensorStatus[ sensor ].calReadComplete = checkConductivityCoefficientRanges( sensor );
+            }
+
             if ( TRUE == conductivitySensorStatus[ sensor ].calReadComplete )
             {
                 calResult = TRUE;