Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -r96b5f969bbba7b44593c85c8ac003be0a2d87151 -r168689667ac7686acb5c54eef5e8084bd1af9aa6
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 96b5f969bbba7b44593c85c8ac003be0a2d87151)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 168689667ac7686acb5c54eef5e8084bd1af9aa6)
@@ -249,7 +249,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/ModeChemicalDisinfectFlush.c
===================================================================
diff -u -r9e5ee62245eb2a73b167eabd6c274a71a76a7b0e -r168689667ac7686acb5c54eef5e8084bd1af9aa6
--- firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision 9e5ee62245eb2a73b167eabd6c274a71a76a7b0e)
+++ firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision 168689667ac7686acb5c54eef5e8084bd1af9aa6)
@@ -161,7 +161,7 @@
 {
     chemDisinfectFlushState                    = DG_CHEM_DISINFECT_FLUSH_STATE_START;
     prevChemDisinfectFlushState                = DG_CHEM_DISINFECT_FLUSH_STATE_START;
-    stateTimer                                 = 0;
+    stateTimer                                 = getMSTimerCount();
     isThisLastDrain                            = FALSE;
     rsrvr1Status                               = NUM_OF_DG_RESERVOIR_STATUS;
     rsrvr2Status                               = NUM_OF_DG_RESERVOIR_STATUS;
Index: firmware/App/Modes/ModeFlush.c
===================================================================
diff -u -r9e5ee62245eb2a73b167eabd6c274a71a76a7b0e -r168689667ac7686acb5c54eef5e8084bd1af9aa6
--- firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision 9e5ee62245eb2a73b167eabd6c274a71a76a7b0e)
+++ firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision 168689667ac7686acb5c54eef5e8084bd1af9aa6)
@@ -154,7 +154,7 @@
     flushLinesVolumeL                         = 0.0F;
     haveDrainParamsBeenInit[ DG_RESERVOIR_1 ] = FALSE;
     haveDrainParamsBeenInit[ DG_RESERVOIR_2 ] = FALSE;
-    stateTimerStart                           = 0;
+    stateTimerStart                           = getMSTimerCount();
     hasFlushStatusBeenWrittenToNV             = FALSE;
 }
 
Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r96b5f969bbba7b44593c85c8ac003be0a2d87151 -r168689667ac7686acb5c54eef5e8084bd1af9aa6
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 96b5f969bbba7b44593c85c8ac003be0a2d87151)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 168689667ac7686acb5c54eef5e8084bd1af9aa6)
@@ -259,7 +259,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;