1 files changed, 21 insertions, 1 deletions
diff --git a/MediaBrowser.Api/ScheduledTasks/ScheduledTasksWebSocketListener.cs b/MediaBrowser.Api/ScheduledTasks/ScheduledTasksWebSocketListener.cs
index c143635bf..0d3f5dfcd 100644
--- a/MediaBrowser.Api/ScheduledTasks/ScheduledTasksWebSocketListener.cs
+++ b/MediaBrowser.Api/ScheduledTasks/ScheduledTasksWebSocketListener.cs
@@ -39,6 +39,8 @@ namespace MediaBrowser.Api.ScheduledTasks
             TaskManager = taskManager;
         }
 
+        private bool _lastResponseHadTasksRunning = true;
+
         /// <summary>
         /// Gets the data to send.
         /// </summary>
@@ -46,7 +48,25 @@ namespace MediaBrowser.Api.ScheduledTasks
         /// <returns>Task{IEnumerable{TaskInfo}}.</returns>
         protected override Task<IEnumerable<TaskInfo>> GetDataToSend(object state)
         {
-            return Task.FromResult(TaskManager.ScheduledTasks
+            var tasks = TaskManager.ScheduledTasks.ToList();
+
+            var anyRunning = tasks.Any(i => i.State != TaskState.Idle);
+
+            if (anyRunning)
+            {
+                _lastResponseHadTasksRunning = true;
+            }
+            else
+            {
+                if (!_lastResponseHadTasksRunning)
+                {
+                    return Task.FromResult<IEnumerable<TaskInfo>>(null);
+                }
+
+                _lastResponseHadTasksRunning = false;
+            }
+
+            return Task.FromResult(tasks
                 .OrderBy(i => i.Name)
                 .Select(ScheduledTaskHelpers.GetTaskInfo)
                 .Where(i => !i.IsHidden));