diff --git a/CHANGELOG.md b/CHANGELOG.md
index 18db580..634756c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -149,6 +149,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
  - Better VC-4 support for IcdConsole
  - JSON refactoring for simpler deserialization
 
+## [8.8.1] - 2020-02-18
+### Changed
+ - IcdTimer - fixed issue that prevented OnElapsed event from firing when Length is less than (or close to) Heartbeat Interval
+
 ## [8.8.0] - 2020-01-23
 ### Added
   - Added an overload to PriorityQueue for determing the de-duplication behaviour
diff --git a/ICD.Common.Utils/Timers/IcdTimer.cs b/ICD.Common.Utils/Timers/IcdTimer.cs
index fb2a633..de2099e 100644
--- a/ICD.Common.Utils/Timers/IcdTimer.cs
+++ b/ICD.Common.Utils/Timers/IcdTimer.cs
@@ -118,6 +118,7 @@ namespace ICD.Common.Utils.Timers
 			Length = length;
 
 			m_Stopwatch.Reset();
+			m_LastHeartbeatMilliseconds = 0;
 			m_Stopwatch.Start();
 
 			RaiseOnIsRunningChanged();