1 files changed, 8 insertions, 0 deletions
diff --git a/MediaBrowser.Api/ScheduledTasks/ScheduledTasksWebSocketListener.cs b/MediaBrowser.Api/ScheduledTasks/ScheduledTasksWebSocketListener.cs
index 0d61c2ce1..f34c53b16 100644
--- a/MediaBrowser.Api/ScheduledTasks/ScheduledTasksWebSocketListener.cs
+++ b/MediaBrowser.Api/ScheduledTasks/ScheduledTasksWebSocketListener.cs
@@ -80,5 +80,13 @@ namespace MediaBrowser.Api.ScheduledTasks
                 return false;
             }
         }
+
+        protected override void Dispose(bool dispose)
+        {
+            TaskManager.TaskExecuting -= TaskManager_TaskExecuting;
+            TaskManager.TaskCompleted -= TaskManager_TaskCompleted;
+            
+            base.Dispose(dispose);
+        }
     }
 }