diff --git a/src/NzbDrone.Api/Calendar/CalendarModule.cs b/src/NzbDrone.Api/Calendar/CalendarModule.cs
index 8a047ddb4..79fabf7ed 100644
--- a/src/NzbDrone.Api/Calendar/CalendarModule.cs
+++ b/src/NzbDrone.Api/Calendar/CalendarModule.cs
@@ -8,7 +8,7 @@ using NzbDrone.Core.Tv;
 
 namespace NzbDrone.Api.Calendar
 {
-    public class CalendarModule : EpisodeModuleWithSignalR<EpisodeResource, Episode>
+    public class CalendarModule : EpisodeModuleWithSignalR
     {
         private readonly IEpisodeService _episodeService;
         private readonly SeriesRepository _seriesRepository;
@@ -22,7 +22,6 @@ namespace NzbDrone.Api.Calendar
             _seriesRepository = seriesRepository;
 
             GetResourceAll = GetCalendar;
-            GetResourceById = GetEpisode;
         }
 
         private List<EpisodeResource> GetCalendar()
diff --git a/src/NzbDrone.Api/Episodes/EpisodeModule.cs b/src/NzbDrone.Api/Episodes/EpisodeModule.cs
index 7d72b5204..e698ab242 100644
--- a/src/NzbDrone.Api/Episodes/EpisodeModule.cs
+++ b/src/NzbDrone.Api/Episodes/EpisodeModule.cs
@@ -5,8 +5,7 @@ using NzbDrone.Core.Tv;
 
 namespace NzbDrone.Api.Episodes
 {
-    public class EpisodeModule : EpisodeModuleWithSignalR<EpisodeResource, Episode>
-                                 
+    public class EpisodeModule : EpisodeModuleWithSignalR     
     {
         private readonly IEpisodeService _episodeService;
 
diff --git a/src/NzbDrone.Api/Episodes/EpisodeModuleWithSignalR.cs b/src/NzbDrone.Api/Episodes/EpisodeModuleWithSignalR.cs
index c90374f40..7612a9601 100644
--- a/src/NzbDrone.Api/Episodes/EpisodeModuleWithSignalR.cs
+++ b/src/NzbDrone.Api/Episodes/EpisodeModuleWithSignalR.cs
@@ -8,11 +8,9 @@ using NzbDrone.Core.Tv;
 
 namespace NzbDrone.Api.Episodes
 {
-    public abstract class EpisodeModuleWithSignalR<TResource, TModel> : NzbDroneRestModuleWithSignalR<TResource, TModel>,
+    public abstract class EpisodeModuleWithSignalR : NzbDroneRestModuleWithSignalR<EpisodeResource, Episode>,
         IHandle<EpisodeGrabbedEvent>,                         
         IHandle<EpisodeDownloadedEvent>
-        where TResource : EpisodeResource, new()
-        where TModel : Episode
     {
         private readonly IEpisodeService _episodeService;
 
@@ -20,6 +18,8 @@ namespace NzbDrone.Api.Episodes
             : base(commandExecutor)
         {
             _episodeService = episodeService;
+
+            GetResourceById = GetEpisode;
         }
 
         protected EpisodeModuleWithSignalR(IEpisodeService episodeService, ICommandExecutor commandExecutor, string resource)
@@ -37,7 +37,7 @@ namespace NzbDrone.Api.Episodes
         {
             foreach (var episode in message.Episode.Episodes)
             {
-                var resource = episode.InjectTo<TResource>();
+                var resource = episode.InjectTo<EpisodeResource>();
                 resource.Grabbed = true;
 
                 BroadcastResourceChange(ModelAction.Updated, resource);
diff --git a/src/NzbDrone.Api/Wanted/CutoffModule.cs b/src/NzbDrone.Api/Wanted/CutoffModule.cs
index 75d3ffbcc..da2e44ef7 100644
--- a/src/NzbDrone.Api/Wanted/CutoffModule.cs
+++ b/src/NzbDrone.Api/Wanted/CutoffModule.cs
@@ -7,7 +7,7 @@ using NzbDrone.Core.Tv;
 
 namespace NzbDrone.Api.Wanted
 {
-    public class CutoffModule : EpisodeModuleWithSignalR<EpisodeResource, Episode>
+    public class CutoffModule : EpisodeModuleWithSignalR
     {
         private readonly IEpisodeCutoffService _episodeCutoffService;
         private readonly ISeriesRepository _seriesRepository;
diff --git a/src/NzbDrone.Api/Wanted/MissingModule.cs b/src/NzbDrone.Api/Wanted/MissingModule.cs
index 44338b888..14fef9104 100644
--- a/src/NzbDrone.Api/Wanted/MissingModule.cs
+++ b/src/NzbDrone.Api/Wanted/MissingModule.cs
@@ -7,7 +7,7 @@ using NzbDrone.Core.Tv;
 
 namespace NzbDrone.Api.Wanted
 {
-    public class MissingModule : EpisodeModuleWithSignalR<EpisodeResource, Episode>
+    public class MissingModule : EpisodeModuleWithSignalR
     {
         private readonly IEpisodeService _episodeService;
         private readonly ISeriesRepository _seriesRepository;