Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -r2e56064726838bfb626ec3ea40132c4e3681639a -r45024586846b99ef02eb0e2ae6554e8ae53e63f9
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 2e56064726838bfb626ec3ea40132c4e3681639a)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 45024586846b99ef02eb0e2ae6554e8ae53e63f9)
@@ -239,7 +239,7 @@
 
     chemDisinfectState                         = DG_CHEM_DISINFECT_STATE_START;
     prevChemDisinfectState                     = DG_CHEM_DISINFECT_STATE_START;
-    stateTimer                                 = 0;
+    stateTimer                                 = getMSTimerCount();
     isThisLastDrain                            = FALSE;
     stateTrialCounter                          = 0;
     rsrvr1Status                               = NUM_OF_DG_RESERVOIR_STATUS;
Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r2e56064726838bfb626ec3ea40132c4e3681639a -r45024586846b99ef02eb0e2ae6554e8ae53e63f9
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 2e56064726838bfb626ec3ea40132c4e3681639a)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 45024586846b99ef02eb0e2ae6554e8ae53e63f9)
@@ -249,7 +249,7 @@
     heatDisinfectState                         = DG_HEAT_DISINFECT_STATE_START;
     prevHeatDisinfectState                     = DG_HEAT_DISINFECT_STATE_START;
     heatDisinfectUIState                       = HEAT_DISINFECT_UI_STATE_NOT_RUNNING;
-    stateTimer                                 = 0;
+    stateTimer                                 = getMSTimerCount();
     stateTrialCounter                          = 0;
     areTempSensorsInRange                      = FALSE;
     rsrvr1Status                               = NUM_OF_DG_RESERVOIR_STATUS;