Index: firmware/App/Modes/ModeChemicalDisinfectFlush.c
===================================================================
diff -u -re12f1b3d41ae133bc0975fcb126e431c2bedda59 -rfd89ed3ac616c0ee40e3ffc357d379cb2f4aa12a
--- firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision e12f1b3d41ae133bc0975fcb126e431c2bedda59)
+++ firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision fd89ed3ac616c0ee40e3ffc357d379cb2f4aa12a)
@@ -200,6 +200,11 @@
 
     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;