Index: firmware/App/Drivers/ConductivitySensors.c
===================================================================
diff -u -ra9983d3e6b07e7c927fab3d16e80b715594fe221 -r9e6e86f604c8cce7c1704ae55d1e026de3422782
--- firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision a9983d3e6b07e7c927fab3d16e80b715594fe221)
+++ firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 9e6e86f604c8cce7c1704ae55d1e026de3422782)
@@ -188,8 +188,10 @@
     lastConductivityErrorCounter[ D43_COND ].data = (U32)getFPGAD43CondErrorCount();
     lastConductivityErrorCounter[ D74_COND ].data = (U32)getFPGAD74CondErrorCount();
 
+#ifdef ENABLE_ALARM_1
     // Monitor conductivity sensor health
     checkConductivitySensors();
+#endif
 }
 
 /*********************************************************************//**
@@ -220,7 +222,7 @@
 
     checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_D17_COND_SENSOR, getConductivitySensorErrorCount( D17_COND ) );
     checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_D27_COND_SENSOR, getConductivitySensorErrorCount( D27_COND ) );
-    checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_D27_COND_SENSOR, getConductivitySensorErrorCount( D29_COND ) );
+    checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_D29_COND_SENSOR, getConductivitySensorErrorCount( D29_COND ) );
     checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_D43_COND_SENSOR, getConductivitySensorErrorCount( D43_COND ) );
     checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_D74_COND_SENSOR, getConductivitySensorErrorCount( D74_COND ) );
 }