diff --git a/frontend/src/Components/SignalRConnector.js b/frontend/src/Components/SignalRConnector.js
index 81f10ab28..028aafce1 100644
--- a/frontend/src/Components/SignalRConnector.js
+++ b/frontend/src/Components/SignalRConnector.js
@@ -138,6 +138,11 @@ class SignalRConnector extends Component {
 
     const handler = this[getHandlerName(name)];
 
+    if (body && body.action === 'updated' && !body.resource) {
+      console.error(`signalR: Null resource broadcast ignored for ${name}`);
+      return;
+    }
+
     if (handler) {
       handler(body);
       return;
diff --git a/src/Lidarr.Http/LidarrRestModuleWithSignalR.cs b/src/Lidarr.Http/LidarrRestModuleWithSignalR.cs
index 0074da5cd..abd024c1c 100644
--- a/src/Lidarr.Http/LidarrRestModuleWithSignalR.cs
+++ b/src/Lidarr.Http/LidarrRestModuleWithSignalR.cs
@@ -58,7 +58,7 @@ namespace Lidarr.Http
 
         protected void BroadcastResourceChange(ModelAction action, TResource resource)
         {
-            if (!_signalRBroadcaster.IsConnected)
+            if (!_signalRBroadcaster.IsConnected || resource == null)
             {
                 return;
             }