diff --git a/MediaBrowser.Server.Implementations/IO/FileRefresher.cs b/MediaBrowser.Server.Implementations/IO/FileRefresher.cs
index 2f4605c5c1..8e28aa2a0e 100644
--- a/MediaBrowser.Server.Implementations/IO/FileRefresher.cs
+++ b/MediaBrowser.Server.Implementations/IO/FileRefresher.cs
@@ -68,6 +68,11 @@ namespace MediaBrowser.Server.Implementations.IO
 
             lock (_timerLock)
             {
+                if (_disposed)
+                {
+                    return;
+                }
+
                 if (_timer == null)
                 {
                     _timer = new Timer(OnTimerCallback, null, TimeSpan.FromSeconds(ConfigurationManager.Configuration.LibraryMonitorDelay), TimeSpan.FromMilliseconds(-1));
@@ -287,6 +292,7 @@ namespace MediaBrowser.Server.Implementations.IO
                 if (_timer != null)
                 {
                     _timer.Dispose();
+                    _timer = null;
                 }
             }
         }