Index: firmware/App/Modes/ModeChemicalDisinfectFlush.c
===================================================================
diff -u -rd19a072db6880577f677093929b53445e34a33e3 -r8c5fef6b7ab382db81084a3abe9604e01882aef9
--- firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision d19a072db6880577f677093929b53445e34a33e3)
+++ firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision 8c5fef6b7ab382db81084a3abe9604e01882aef9)
@@ -8,7 +8,7 @@
 * @file    ModeChemicalDisinfectFlush.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      04-May-2023
+* @date    (last)      11-May-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  15-Nov-2022
@@ -200,6 +200,11 @@
     setCurrentSubState( NO_SUB_STATE );
     setCPLDCleanLEDColor( CPLD_CLEAN_LED_YELLOW );
 
+    // Upon transition to mode chemical flush set CD1 and CD2 calibration records to be picked to the normal
+    // table. If the chemical disinfect is successful, mode chemical disinfect flush is automatically started
+    setCondcutivitySensorCalTable( CONDUCTIVITYSENSORS_CD1_SENSOR, CAL_DATA_CD1_COND_SENSOR );
+    setCondcutivitySensorCalTable( CONDUCTIVITYSENSORS_CD2_SENSOR, CAL_DATA_CD2_COND_SENSOR );
+
     activateAlarmNoData( ALARM_ID_DG_CHEM_DISINFECT_FLUSH_REMOVE_ACID );
 
     return chemDisinfectFlushState;