Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r96b5f969bbba7b44593c85c8ac003be0a2d87151 -rc13e9a0d22d9a9e79ee7ffe5c74648e502e109d0
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 96b5f969bbba7b44593c85c8ac003be0a2d87151)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision c13e9a0d22d9a9e79ee7ffe5c74648e502e109d0)
@@ -259,14 +259,14 @@
     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;
     rsrvr2Status                               = NUM_OF_DG_RESERVOIR_STATUS;
     rsrvr1RefVolML                             = 0.0F;
     rsrvr2RefVolML                             = 0.0F;
-    overallHeatDisinfectTimer                  = 0;
+    overallHeatDisinfectTimer                  = getMSTimerCount();
     cancellationMode                           = CANCELLATION_MODE_NONE;
     rsrvrFillStableTimeCounter                 = 0;
     isDrainPumpInMixDrainOn                    = FALSE;
@@ -1752,10 +1752,9 @@
  *
  * @details Inputs:  tempGradOutOfRangeTimer,      areRsrvrsLeaking,
  *                   isPartialDisinfectInProgress, heatDisinfectTimer,
- *                   targetDisinfectTime
  * @details Outputs: tempGradOutOfRangeTimer, alarmDetectedPendingTrigger,
  *                   areRsrvrsLeaking,        isPartialDisinfectInProgress,
- *                   heatDisinfectTimer,      targetDisinfectTime
+ *                   heatDisinfectTimer
  * @return status of the heat disinfect (i.e in progress, complete)
  *************************************************************************/
 static HEAT_DISINFECT_STATUS_T getHeatDisinfectStatus( void )