Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -re258c4013bdffbf4f9e77ab9ef35fd67e3d1bb8f -reeaab2a9a685fb18845888d91040d3aa01977f6d
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision e258c4013bdffbf4f9e77ab9ef35fd67e3d1bb8f)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision eeaab2a9a685fb18845888d91040d3aa01977f6d)
@@ -7,8 +7,8 @@
 *
 * @file    ModeChemicalDisinfect.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      30-Mar-2023
+* @author  (last)      Michael Garthwaite
+* @date    (last)      16-May-2023
 *
 * @author  (original)  Sean
 * @date    (original)  04-Apr-2020
@@ -293,9 +293,12 @@
     deenergizeActuators( NO_PARK_CONC_PUMPS );
 
     initChemicalDisinfectMode();
-
+    setCurrentSubState( NO_SUB_STATE );
     setCPLDCleanLEDColor( CPLD_CLEAN_LED_YELLOW );
 
+    // Set CD1 and CD2 conductivity sensors calibration table to be picked from the chemical disinfect calibration record
+    setCondcutivitySensorCalTable( CONDUCTIVITYSENSORS_CD2_SENSOR, CAL_DATA_CD2_COND_SENSOR_CHEM_DISINFECT );
+
 #ifndef _RELEASE_
     if ( nelsonSupport != NELSON_CHEM_DISINFECT )
 #endif