Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -re12f1b3d41ae133bc0975fcb126e431c2bedda59 -rf248e95cb4a3187aee8d7e7ea773a0549ec7be30
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision e12f1b3d41ae133bc0975fcb126e431c2bedda59)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision f248e95cb4a3187aee8d7e7ea773a0549ec7be30)
@@ -8,7 +8,7 @@
 * @file    ModeChemicalDisinfect.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      30-Mar-2023
+* @date    (last)      04-May-2023
 *
 * @author  (original)  Sean
 * @date    (original)  04-Apr-2020
@@ -296,6 +296,9 @@
 
     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
@@ -1669,8 +1672,9 @@
     if ( ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_CAPS_MONITOR ) != SW_CONFIG_ENABLE_VALUE ) && ( NELSON_NONE == nelsonSupport ) )
 #endif
     {
-        // If the dialysate cap is open during any state, alarm
-        if ( ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ) && ( chemDisinfectState != DG_CHEM_DISINFECT_STATE_START ) )
+        // If the dialysate cap is closed during any state other the start state, alarm. In start state we are still looking for
+        // the user to insert the acid into the dialysate port and hit ok
+        if ( ( STATE_CLOSED == getSwitchStatus( DIALYSATE_CAP ) ) && ( chemDisinfectState != DG_CHEM_DISINFECT_STATE_START ) )
         {
             prevChemDisinfectState      = chemDisinfectState;
             chemDisinfectState          = DG_CHEM_DISINFECT_STATE_CANCEL_WATER_PATH;