diff --git a/CHANGELOG.md b/CHANGELOG.md
index 788eb59..b361b6f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
  - Adding SequenceComparer for ordering collections of lists, arrays, etc
 
+### Changed
+ - Potential fix for timer disposal on Net Standard
+
 ## [3.6.0] - 2018-06-19
 ### Added
  - Added ZIP features for examining the contents of an archive
diff --git a/ICD.Common.Utils/Timers/SafeTimer.cs b/ICD.Common.Utils/Timers/SafeTimer.cs
index 3f028e9..533d30c 100644
--- a/ICD.Common.Utils/Timers/SafeTimer.cs
+++ b/ICD.Common.Utils/Timers/SafeTimer.cs
@@ -82,8 +82,12 @@ namespace ICD.Common.Utils.Timers
 		/// </summary>
 		public void Dispose()
 		{
+			if (IsDisposed)
+				return;
+
 			Stop();
 			m_Timer.Dispose();
+
 			IsDisposed = true;
 		}