diff --git a/src/Microsoft.AspNet.SignalR.Core/Microsoft.AspNet.SignalR.Core.csproj b/src/Microsoft.AspNet.SignalR.Core/Microsoft.AspNet.SignalR.Core.csproj
index 69a84c46a1..ad7594c8d8 100644
--- a/src/Microsoft.AspNet.SignalR.Core/Microsoft.AspNet.SignalR.Core.csproj
+++ b/src/Microsoft.AspNet.SignalR.Core/Microsoft.AspNet.SignalR.Core.csproj
@@ -43,9 +43,6 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.AspNet.SignalR.Client">
-      <HintPath>..\packages\Microsoft.AspNet.SignalR.Client.2.1.1\lib\net40\Microsoft.AspNet.SignalR.Client.dll</HintPath>
-    </Reference>
     <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Newtonsoft.Json.6.0.4\lib\net40\Newtonsoft.Json.dll</HintPath>
diff --git a/src/Microsoft.AspNet.SignalR.Core/packages.config b/src/Microsoft.AspNet.SignalR.Core/packages.config
index 503ad43710..24c2fdd748 100644
--- a/src/Microsoft.AspNet.SignalR.Core/packages.config
+++ b/src/Microsoft.AspNet.SignalR.Core/packages.config
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.AspNet.SignalR.Client" version="2.1.1" targetFramework="net40" />
   <package id="Newtonsoft.Json" version="6.0.4" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/src/NzbDrone.Api/Calendar/CalendarModule.cs b/src/NzbDrone.Api/Calendar/CalendarModule.cs
index 79fabf7ed2..a97e55e8bc 100644
--- a/src/NzbDrone.Api/Calendar/CalendarModule.cs
+++ b/src/NzbDrone.Api/Calendar/CalendarModule.cs
@@ -5,6 +5,7 @@
 using NzbDrone.Api.Extensions;
 using NzbDrone.Core.Messaging.Commands;
 using NzbDrone.Core.Tv;
+using NzbDrone.SignalR;
 
 namespace NzbDrone.Api.Calendar
 {
@@ -13,10 +14,10 @@ public class CalendarModule : EpisodeModuleWithSignalR
         private readonly IEpisodeService _episodeService;
         private readonly SeriesRepository _seriesRepository;
 
-        public CalendarModule(ICommandExecutor commandExecutor,
+        public CalendarModule(IBroadcastSignalRMessage signalRBroadcaster,
                               IEpisodeService episodeService,
                               SeriesRepository seriesRepository)
-            : base(episodeService, commandExecutor, "calendar")
+            : base(episodeService, signalRBroadcaster, "calendar")
         {
             _episodeService = episodeService;
             _seriesRepository = seriesRepository;
diff --git a/src/NzbDrone.Api/Commands/CommandModule.cs b/src/NzbDrone.Api/Commands/CommandModule.cs
index ddb5ff9567..4afcf2c804 100644
--- a/src/NzbDrone.Api/Commands/CommandModule.cs
+++ b/src/NzbDrone.Api/Commands/CommandModule.cs
@@ -10,6 +10,7 @@
 using NzbDrone.Core.Messaging.Commands.Tracking;
 using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.ProgressMessaging;
+using NzbDrone.SignalR;
 
 
 namespace NzbDrone.Api.Commands
@@ -20,8 +21,8 @@ public class CommandModule : NzbDroneRestModuleWithSignalR<CommandResource, Comm
         private readonly IContainer _container;
         private readonly ITrackCommands _trackCommands;
 
-        public CommandModule(ICommandExecutor commandExecutor, IContainer container, ITrackCommands trackCommands)
-            : base(commandExecutor)
+        public CommandModule(ICommandExecutor commandExecutor,IBroadcastSignalRMessage signalRBroadcaster, IContainer container, ITrackCommands trackCommands)
+            : base(signalRBroadcaster)
         {
             _commandExecutor = commandExecutor;
             _container = container;
diff --git a/src/NzbDrone.Api/EpisodeFiles/EpisodeFileModule.cs b/src/NzbDrone.Api/EpisodeFiles/EpisodeFileModule.cs
index 98af26a4a4..09f54299f2 100644
--- a/src/NzbDrone.Api/EpisodeFiles/EpisodeFileModule.cs
+++ b/src/NzbDrone.Api/EpisodeFiles/EpisodeFileModule.cs
@@ -2,16 +2,15 @@
 using System.IO;
 using System.Linq;
 using NLog;
-using NzbDrone.Api.Episodes;
 using NzbDrone.Api.REST;
 using NzbDrone.Core.Datastore.Events;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Api.Mapping;
 using NzbDrone.Core.MediaFiles.Events;
-using NzbDrone.Core.Messaging.Commands;
 using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.Tv;
 using NzbDrone.Core.DecisionEngine;
+using NzbDrone.SignalR;
 
 namespace NzbDrone.Api.EpisodeFiles
 {
@@ -24,13 +23,13 @@ public class EpisodeModule : NzbDroneRestModuleWithSignalR<EpisodeFileResource,
         private readonly IQualityUpgradableSpecification _qualityUpgradableSpecification;
         private readonly Logger _logger;
 
-        public EpisodeModule(ICommandExecutor commandExecutor,
+        public EpisodeModule(IBroadcastSignalRMessage signalRBroadcaster,
                              IMediaFileService mediaFileService,
                              IRecycleBinProvider recycleBinProvider,
                              ISeriesService seriesService,
                              IQualityUpgradableSpecification qualityUpgradableSpecification,
                              Logger logger)
-            : base(commandExecutor)
+            : base(signalRBroadcaster)
         {
             _mediaFileService = mediaFileService;
             _recycleBinProvider = recycleBinProvider;
diff --git a/src/NzbDrone.Api/Episodes/EpisodeModule.cs b/src/NzbDrone.Api/Episodes/EpisodeModule.cs
index 3dbb160643..4a5a649e5f 100644
--- a/src/NzbDrone.Api/Episodes/EpisodeModule.cs
+++ b/src/NzbDrone.Api/Episodes/EpisodeModule.cs
@@ -4,6 +4,7 @@
 using NzbDrone.Core.Tv;
 using NzbDrone.Api.Mapping;
 using NzbDrone.Core.DecisionEngine;
+using NzbDrone.SignalR;
 
 namespace NzbDrone.Api.Episodes
 {
@@ -13,8 +14,9 @@ public class EpisodeModule : EpisodeModuleWithSignalR
         private readonly IEpisodeService _episodeService;
         private readonly IQualityUpgradableSpecification _qualityUpgradableSpecification;
 
-        public EpisodeModule(ICommandExecutor commandExecutor, ISeriesService seriesService, IEpisodeService episodeService, IQualityUpgradableSpecification qualityUpgradableSpecification)
-            : base(episodeService, commandExecutor)
+        public EpisodeModule(IBroadcastSignalRMessage signalRBroadcaster, ISeriesService seriesService, IEpisodeService episodeService, 
+            IQualityUpgradableSpecification qualityUpgradableSpecification)
+            : base(episodeService, signalRBroadcaster)
         {
             _seriesService = seriesService;
             _episodeService = episodeService;
diff --git a/src/NzbDrone.Api/Episodes/EpisodeModuleWithSignalR.cs b/src/NzbDrone.Api/Episodes/EpisodeModuleWithSignalR.cs
index a1ba8b57ff..7976767f8a 100644
--- a/src/NzbDrone.Api/Episodes/EpisodeModuleWithSignalR.cs
+++ b/src/NzbDrone.Api/Episodes/EpisodeModuleWithSignalR.cs
@@ -2,9 +2,9 @@
 using NzbDrone.Core.Datastore.Events;
 using NzbDrone.Core.Download;
 using NzbDrone.Core.MediaFiles.Events;
-using NzbDrone.Core.Messaging.Commands;
 using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.Tv;
+using NzbDrone.SignalR;
 
 namespace NzbDrone.Api.Episodes
 {
@@ -14,16 +14,16 @@ public abstract class EpisodeModuleWithSignalR : NzbDroneRestModuleWithSignalR<E
     {
         private readonly IEpisodeService _episodeService;
 
-        protected EpisodeModuleWithSignalR(IEpisodeService episodeService, ICommandExecutor commandExecutor)
-            : base(commandExecutor)
+        protected EpisodeModuleWithSignalR(IEpisodeService episodeService, IBroadcastSignalRMessage signalRBroadcaster)
+            : base(signalRBroadcaster)
         {
             _episodeService = episodeService;
 
             GetResourceById = GetEpisode;
         }
 
-        protected EpisodeModuleWithSignalR(IEpisodeService episodeService, ICommandExecutor commandExecutor, string resource)
-            : base(commandExecutor, resource)
+        protected EpisodeModuleWithSignalR(IEpisodeService episodeService, IBroadcastSignalRMessage signalRBroadcaster, string resource)
+            : base(signalRBroadcaster, resource)
         {
             _episodeService = episodeService;
 
diff --git a/src/NzbDrone.Api/Health/HealthModule.cs b/src/NzbDrone.Api/Health/HealthModule.cs
index a876925d62..4928f3613e 100644
--- a/src/NzbDrone.Api/Health/HealthModule.cs
+++ b/src/NzbDrone.Api/Health/HealthModule.cs
@@ -1,9 +1,8 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using NzbDrone.Core.Datastore.Events;
 using NzbDrone.Core.HealthCheck;
-using NzbDrone.Core.Messaging.Commands;
 using NzbDrone.Core.Messaging.Events;
+using NzbDrone.SignalR;
 
 namespace NzbDrone.Api.Health
 {
@@ -12,8 +11,8 @@ public class HealthModule : NzbDroneRestModuleWithSignalR<HealthResource, Health
     {
         private readonly IHealthCheckService _healthCheckService;
 
-        public HealthModule(ICommandExecutor commandExecutor, IHealthCheckService healthCheckService)
-            : base(commandExecutor)
+        public HealthModule(IBroadcastSignalRMessage signalRBroadcaster, IHealthCheckService healthCheckService)
+            : base(signalRBroadcaster)
         {
             _healthCheckService = healthCheckService;
             GetResourceAll = GetHealth;
diff --git a/src/NzbDrone.Api/NzbDroneRestModuleWithSignalR.cs b/src/NzbDrone.Api/NzbDroneRestModuleWithSignalR.cs
index bb35273dfa..761503dfab 100644
--- a/src/NzbDrone.Api/NzbDroneRestModuleWithSignalR.cs
+++ b/src/NzbDrone.Api/NzbDroneRestModuleWithSignalR.cs
@@ -1,7 +1,6 @@
 using NzbDrone.Api.REST;
 using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Datastore.Events;
-using NzbDrone.Core.Messaging.Commands;
 using NzbDrone.Core.Messaging.Events;
 using NzbDrone.SignalR;
 
@@ -11,17 +10,17 @@ public abstract class NzbDroneRestModuleWithSignalR<TResource, TModel> : NzbDron
         where TResource : RestResource, new()
         where TModel : ModelBase
     {
-        private readonly ICommandExecutor _commandExecutor;
+        private readonly IBroadcastSignalRMessage _signalRBroadcaster;
 
-        protected NzbDroneRestModuleWithSignalR(ICommandExecutor commandExecutor)
+        protected NzbDroneRestModuleWithSignalR(IBroadcastSignalRMessage signalRBroadcaster)
         {
-            _commandExecutor = commandExecutor;
+            _signalRBroadcaster = signalRBroadcaster;
         }
 
-        protected NzbDroneRestModuleWithSignalR(ICommandExecutor commandExecutor, string resource)
+        protected NzbDroneRestModuleWithSignalR(IBroadcastSignalRMessage signalRBroadcaster, string resource)
             : base(resource)
         {
-            _commandExecutor = commandExecutor;
+            _signalRBroadcaster = signalRBroadcaster;
         }
 
         public void Handle(ModelEvent<TModel> message)
@@ -34,6 +33,13 @@ public void Handle(ModelEvent<TModel> message)
             BroadcastResourceChange(message.Action, message.Model.Id);
         }
 
+        protected void BroadcastResourceChange(ModelAction action, int id)
+        {
+            var resource = GetResourceById(id);
+            BroadcastResourceChange(action, resource);
+        }
+
+
         protected void BroadcastResourceChange(ModelAction action, TResource resource)
         {
             var signalRMessage = new SignalRMessage
@@ -42,22 +48,10 @@ protected void BroadcastResourceChange(ModelAction action, TResource resource)
                 Body = new ResourceChangeMessage<TResource>(resource, action)
             };
 
-            _commandExecutor.PublishCommand(new BroadcastSignalRMessage(signalRMessage));
-        }
-
-        protected void BroadcastResourceChange(ModelAction action, int id)
-        {
-            var resource = GetResourceById(id);
-
-            var signalRMessage = new SignalRMessage
-            {
-                Name = Resource,
-                Body = new ResourceChangeMessage<TResource>(resource, action)
-            };
-
-            _commandExecutor.PublishCommand(new BroadcastSignalRMessage(signalRMessage));
+            _signalRBroadcaster.BroadcastMessage(signalRMessage);
         }
 
+     
         protected void BroadcastResourceChange(ModelAction action)
         {
             var signalRMessage = new SignalRMessage
@@ -66,7 +60,7 @@ protected void BroadcastResourceChange(ModelAction action)
                 Body = new ResourceChangeMessage<TResource>(action)
             };
 
-            _commandExecutor.PublishCommand(new BroadcastSignalRMessage(signalRMessage));
+            _signalRBroadcaster.BroadcastMessage(signalRMessage);
         }
     }
 }
\ No newline at end of file
diff --git a/src/NzbDrone.Api/Queue/QueueModule.cs b/src/NzbDrone.Api/Queue/QueueModule.cs
index 1c735050ab..69dc0a9ad9 100644
--- a/src/NzbDrone.Api/Queue/QueueModule.cs
+++ b/src/NzbDrone.Api/Queue/QueueModule.cs
@@ -2,9 +2,9 @@
 using System.Linq;
 using NzbDrone.Core.Datastore.Events;
 using NzbDrone.Core.Download.Pending;
-using NzbDrone.Core.Messaging.Commands;
 using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.Queue;
+using NzbDrone.SignalR;
 
 namespace NzbDrone.Api.Queue
 {
@@ -14,8 +14,8 @@ public class QueueModule : NzbDroneRestModuleWithSignalR<QueueResource, Core.Que
         private readonly IQueueService _queueService;
         private readonly IPendingReleaseService _pendingReleaseService;
 
-        public QueueModule(ICommandExecutor commandExecutor, IQueueService queueService, IPendingReleaseService pendingReleaseService)
-            : base(commandExecutor)
+        public QueueModule(IBroadcastSignalRMessage broadcastSignalRMessage, IQueueService queueService, IPendingReleaseService pendingReleaseService)
+            : base(broadcastSignalRMessage)
         {
             _queueService = queueService;
             _pendingReleaseService = pendingReleaseService;
diff --git a/src/NzbDrone.Api/RootFolders/RootFolderModule.cs b/src/NzbDrone.Api/RootFolders/RootFolderModule.cs
index 36e034946c..fa6934cb44 100644
--- a/src/NzbDrone.Api/RootFolders/RootFolderModule.cs
+++ b/src/NzbDrone.Api/RootFolders/RootFolderModule.cs
@@ -1,11 +1,9 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using FluentValidation;
-using FluentValidation.Results;
-using NzbDrone.Core.Messaging.Commands;
 using NzbDrone.Core.RootFolders;
 using NzbDrone.Api.Mapping;
 using NzbDrone.Core.Validation.Paths;
+using NzbDrone.SignalR;
 
 namespace NzbDrone.Api.RootFolders
 {
@@ -14,11 +12,11 @@ public class RootFolderModule : NzbDroneRestModuleWithSignalR<RootFolderResource
         private readonly IRootFolderService _rootFolderService;
 
         public RootFolderModule(IRootFolderService rootFolderService,
-                                ICommandExecutor commandExecutor,
+                                IBroadcastSignalRMessage signalRBroadcaster,
                                 RootFolderValidator rootFolderValidator,
                                 PathExistsValidator pathExistsValidator,
                                 DroneFactoryValidator droneFactoryValidator)
-            : base(commandExecutor)
+            : base(signalRBroadcaster)
         {
             _rootFolderService = rootFolderService;
 
diff --git a/src/NzbDrone.Api/Series/SeriesModule.cs b/src/NzbDrone.Api/Series/SeriesModule.cs
index add57172e0..d880b2a0b1 100644
--- a/src/NzbDrone.Api/Series/SeriesModule.cs
+++ b/src/NzbDrone.Api/Series/SeriesModule.cs
@@ -15,6 +15,7 @@
 using NzbDrone.Core.Tv.Events;
 using NzbDrone.Core.Validation.Paths;
 using NzbDrone.Core.DataAugmentation.Scene;
+using NzbDrone.SignalR;
 
 namespace NzbDrone.Api.Series
 {
@@ -31,7 +32,7 @@ public class SeriesModule : NzbDroneRestModuleWithSignalR<SeriesResource, Core.T
         private readonly ISceneMappingService _sceneMappingService;
         private readonly IMapCoversToLocal _coverMapper;
 
-        public SeriesModule(ICommandExecutor commandExecutor,
+        public SeriesModule(IBroadcastSignalRMessage signalRBroadcaster,
                             ISeriesService seriesService,
                             ISeriesStatisticsService seriesStatisticsService,
                             ISceneMappingService sceneMappingService,
@@ -42,7 +43,7 @@ public SeriesModule(ICommandExecutor commandExecutor,
                             DroneFactoryValidator droneFactoryValidator,
                             SeriesAncestorValidator seriesAncestorValidator
             )
-            : base(commandExecutor)
+            : base(signalRBroadcaster)
         {
             _seriesService = seriesService;
             _seriesStatisticsService = seriesStatisticsService;
diff --git a/src/NzbDrone.Api/Wanted/CutoffModule.cs b/src/NzbDrone.Api/Wanted/CutoffModule.cs
index 384ee43ac6..eb75147985 100644
--- a/src/NzbDrone.Api/Wanted/CutoffModule.cs
+++ b/src/NzbDrone.Api/Wanted/CutoffModule.cs
@@ -1,10 +1,9 @@
-using System;
-using System.Linq;
+using System.Linq;
 using NzbDrone.Api.Episodes;
 using NzbDrone.Api.Extensions;
 using NzbDrone.Core.Datastore;
-using NzbDrone.Core.Messaging.Commands;
 using NzbDrone.Core.Tv;
+using NzbDrone.SignalR;
 
 namespace NzbDrone.Api.Wanted
 {
@@ -13,8 +12,8 @@ public class CutoffModule : EpisodeModuleWithSignalR
         private readonly IEpisodeCutoffService _episodeCutoffService;
         private readonly ISeriesRepository _seriesRepository;
 
-        public CutoffModule(IEpisodeService episodeService, IEpisodeCutoffService episodeCutoffService, ISeriesRepository seriesRepository, ICommandExecutor commandExecutor)
-            :base(episodeService, commandExecutor, "wanted/cutoff")
+        public CutoffModule(IEpisodeService episodeService, IEpisodeCutoffService episodeCutoffService, ISeriesRepository seriesRepository, IBroadcastSignalRMessage signalRBroadcaster)
+            : base(episodeService, signalRBroadcaster, "wanted/cutoff")
         {
             _episodeCutoffService = episodeCutoffService;
             _seriesRepository = seriesRepository;
diff --git a/src/NzbDrone.Api/Wanted/MissingModule.cs b/src/NzbDrone.Api/Wanted/MissingModule.cs
index f551cdd676..78e4c44952 100644
--- a/src/NzbDrone.Api/Wanted/MissingModule.cs
+++ b/src/NzbDrone.Api/Wanted/MissingModule.cs
@@ -5,6 +5,7 @@
 using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Messaging.Commands;
 using NzbDrone.Core.Tv;
+using NzbDrone.SignalR;
 
 namespace NzbDrone.Api.Wanted
 {
@@ -13,8 +14,8 @@ public class MissingModule : EpisodeModuleWithSignalR
         private readonly IEpisodeService _episodeService;
         private readonly ISeriesRepository _seriesRepository;
 
-        public MissingModule(IEpisodeService episodeService, ISeriesRepository seriesRepository, ICommandExecutor commandExecutor)
-            :base(episodeService, commandExecutor, "wanted/missing")
+        public MissingModule(IEpisodeService episodeService, ISeriesRepository seriesRepository, IBroadcastSignalRMessage signalRBroadcaster)
+            : base(episodeService, signalRBroadcaster, "wanted/missing")
         {
             _episodeService = episodeService;
             _seriesRepository = seriesRepository;
diff --git a/src/NzbDrone.Core.Test/Messaging/Commands/CommandEqualityComparerFixture.cs b/src/NzbDrone.Core.Test/Messaging/Commands/CommandEqualityComparerFixture.cs
index 56bfd1b2af..88b1f86b04 100644
--- a/src/NzbDrone.Core.Test/Messaging/Commands/CommandEqualityComparerFixture.cs
+++ b/src/NzbDrone.Core.Test/Messaging/Commands/CommandEqualityComparerFixture.cs
@@ -79,8 +79,8 @@ public void should_return_false_when_only_one_has_properties()
         [Test]
         public void should_return_false_when_only_one_has_null_property()
         {
-            var command1 = new BroadcastSignalRMessage(null);
-            var command2 = new BroadcastSignalRMessage(new SignalRMessage());
+            var command1 = new EpisodeSearchCommand(null);
+            var command2 = new EpisodeSearchCommand(new List<int>());
 
             CommandEqualityComparer.Instance.Equals(command1, command2).Should().BeFalse();
         }
diff --git a/src/NzbDrone.Core/Jobs/TaskManager.cs b/src/NzbDrone.Core/Jobs/TaskManager.cs
index 51275c91f9..46c6f79d5e 100644
--- a/src/NzbDrone.Core/Jobs/TaskManager.cs
+++ b/src/NzbDrone.Core/Jobs/TaskManager.cs
@@ -102,9 +102,6 @@ public void Handle(ApplicationStartedEvent message)
 
         public void Handle(CommandExecutedEvent message)
         {
-            if (message.Command.GetType().Name == "BroadcastSignalRMessage")
-                return;
-
             var scheduledTask = _scheduledTaskRepository.All().SingleOrDefault(c => c.TypeName == message.Command.GetType().FullName);
 
             if (scheduledTask != null)
@@ -122,7 +119,7 @@ public void HandleAsync(ConfigSavedEvent message)
             var downloadedEpisodes = _scheduledTaskRepository.GetDefinition(typeof(DownloadedEpisodesScanCommand));
             downloadedEpisodes.Interval = _configService.DownloadedEpisodesScanInterval;
 
-            _scheduledTaskRepository.UpdateMany(new List<ScheduledTask>{ rss, downloadedEpisodes });
+            _scheduledTaskRepository.UpdateMany(new List<ScheduledTask> { rss, downloadedEpisodes });
         }
     }
 }
diff --git a/src/NzbDrone.SignalR/BroadcastSignalRMessage.cs b/src/NzbDrone.SignalR/BroadcastSignalRMessage.cs
deleted file mode 100644
index d989affc3f..0000000000
--- a/src/NzbDrone.SignalR/BroadcastSignalRMessage.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using NzbDrone.Core.Messaging.Commands;
-
-namespace NzbDrone.SignalR
-{
-    public class BroadcastSignalRMessage : Command
-    {
-        public SignalRMessage Body { get; private set; }
-
-        public BroadcastSignalRMessage(SignalRMessage body)
-        {
-            Body = body;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/NzbDrone.SignalR/NzbDrone.SignalR.csproj b/src/NzbDrone.SignalR/NzbDrone.SignalR.csproj
index ad9160e06b..0e50162e37 100644
--- a/src/NzbDrone.SignalR/NzbDrone.SignalR.csproj
+++ b/src/NzbDrone.SignalR/NzbDrone.SignalR.csproj
@@ -50,7 +50,6 @@
     <Compile Include="..\NzbDrone.Common\Properties\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include="BroadcastSignalRMessage.cs" />
     <Compile Include="NoOpPerformanceCounterManager.cs" />
     <Compile Include="NzbDronePersistentConnection.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
diff --git a/src/NzbDrone.SignalR/NzbDronePersistentConnection.cs b/src/NzbDrone.SignalR/NzbDronePersistentConnection.cs
index 8152380222..2a25333761 100644
--- a/src/NzbDrone.SignalR/NzbDronePersistentConnection.cs
+++ b/src/NzbDrone.SignalR/NzbDronePersistentConnection.cs
@@ -4,7 +4,12 @@
 
 namespace NzbDrone.SignalR
 {
-    public sealed class NzbDronePersistentConnection : PersistentConnection, IExecute<BroadcastSignalRMessage>
+    public interface IBroadcastSignalRMessage
+    {
+        void BroadcastMessage(SignalRMessage message);
+    }
+
+    public sealed class NzbDronePersistentConnection : PersistentConnection, IBroadcastSignalRMessage
     {
         private IPersistentConnectionContext Context
         {
@@ -14,9 +19,9 @@ private IPersistentConnectionContext Context
             }
         }
 
-        public void Execute(BroadcastSignalRMessage message)
+        public void BroadcastMessage(SignalRMessage message)
         {
-            Context.Connection.Broadcast(message.Body);
+            Context.Connection.Broadcast(message);
         }
     }
 }
\ No newline at end of file