Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r3e5c16b70fb34da7d58f5cf6efff896fdb3d00c3 -rfd89ed3ac616c0ee40e3ffc357d379cb2f4aa12a
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 3e5c16b70fb34da7d58f5cf6efff896fdb3d00c3)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision fd89ed3ac616c0ee40e3ffc357d379cb2f4aa12a)
@@ -130,6 +130,11 @@
 
     setCPLDCleanLEDColor( CPLD_CLEAN_LED_OFF );
 
+    // Upon transition to mode standby set CD1 and CD2 calibration records to be picked to the normal
+    // table. If the chemical disinfect fails, the mode transitions back to mode standby.
+    setCondcutivitySensorCalTable( CONDUCTIVITYSENSORS_CD1_SENSOR, CAL_DATA_CD1_COND_SENSOR );
+    setCondcutivitySensorCalTable( CONDUCTIVITYSENSORS_CD2_SENSOR, CAL_DATA_CD2_COND_SENSOR );
+
 #ifndef _RELEASE_
     setHeatNelsonSupportMode( NELSON_NONE );
     setChemNelsonSupportMode( NELSON_NONE );