Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -r5652568f680408e60fe5fb84eee926e8804c07d7 -ra069a798bc85ad39afb0df9b440457c1f18f2ba3
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 5652568f680408e60fe5fb84eee926e8804c07d7)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision a069a798bc85ad39afb0df9b440457c1f18f2ba3)
@@ -187,8 +187,9 @@
     emstatBoardRead[ EMSTAT_CPI_CPO_BOARD ].sensors[ EMSTAT_CPO_OR_CD2_INDEX ].condSnsrTempSnsr     = TEMPSENSORS_OUTLET_PRIMARY_HEATER;
     emstatBoardRead[ EMSTAT_CPI_CPO_BOARD ].sensors[ EMSTAT_CPO_OR_CD2_INDEX ].condSnsrHex2StrAlarm = ALARM_ID_DG_CPO_COND_SENSOR_INVALID_CHAR;
     // CD1/CD2 Emstat board conductivity sensors and their corresponding temperature sensors
+    // NOTE: For CD1, use TD2 temperature sensor for compensation since it is a more accurate temperature sensor
     emstatBoardRead[ EMSTAT_CD1_CD2_BOARD ].sensors[ EMSTAT_CPI_OR_CD1_INDEX ].condSnsr             = CONDUCTIVITYSENSORS_CD1_SENSOR;
-    emstatBoardRead[ EMSTAT_CD1_CD2_BOARD ].sensors[ EMSTAT_CPI_OR_CD1_INDEX ].condSnsrTempSnsr     = TEMPSENSORS_CONDUCTIVITY_SENSOR_1;
+    emstatBoardRead[ EMSTAT_CD1_CD2_BOARD ].sensors[ EMSTAT_CPI_OR_CD1_INDEX ].condSnsrTempSnsr     = TEMPSENSORS_CONDUCTIVITY_SENSOR_2;
     emstatBoardRead[ EMSTAT_CD1_CD2_BOARD ].sensors[ EMSTAT_CPI_OR_CD1_INDEX ].condSnsrHex2StrAlarm = ALARM_ID_DG_CD1_COND_SENSOR_INVALID_CHAR;
     emstatBoardRead[ EMSTAT_CD1_CD2_BOARD ].sensors[ EMSTAT_CPO_OR_CD2_INDEX ].condSnsr             = CONDUCTIVITYSENSORS_CD2_SENSOR;
     emstatBoardRead[ EMSTAT_CD1_CD2_BOARD ].sensors[ EMSTAT_CPO_OR_CD2_INDEX ].condSnsrTempSnsr     = TEMPSENSORS_CONDUCTIVITY_SENSOR_2;