diff --git a/src/NzbDrone.Core.Test/Providers/XemProxyFixture.cs b/src/NzbDrone.Core.Test/Providers/XemProxyFixture.cs
index 58ae5ec95..c1bbee68d 100644
--- a/src/NzbDrone.Core.Test/Providers/XemProxyFixture.cs
+++ b/src/NzbDrone.Core.Test/Providers/XemProxyFixture.cs
@@ -46,14 +46,23 @@ namespace NzbDrone.Core.Test.Providers
         }
 
 
-        [Test]
-        public void should_get_mapping()
+        [TestCase(82807)]
+        public void should_get_mapping(int seriesId)
         {
-            var result = Subject.GetSceneTvdbMappings(82807);
+            var result = Subject.GetSceneTvdbMappings(seriesId);
 
             result.Should().NotBeEmpty();
             result.Should().OnlyContain(c => c.Scene != null);
             result.Should().OnlyContain(c => c.Tvdb != null);
         }
+
+
+        [TestCase(78916)]
+        public void should_filter_out_episodes_without_scene_mapping(int seriesId)
+        {
+            var result = Subject.GetSceneTvdbMappings(seriesId);
+
+            result.Should().NotContain(c => c.Tvdb == null);
+        }
     }
 }
\ No newline at end of file
diff --git a/src/NzbDrone.Core/DataAugmentation/Xem/XemProxy.cs b/src/NzbDrone.Core/DataAugmentation/Xem/XemProxy.cs
index 0747ab678..4f7eeba63 100644
--- a/src/NzbDrone.Core/DataAugmentation/Xem/XemProxy.cs
+++ b/src/NzbDrone.Core/DataAugmentation/Xem/XemProxy.cs
@@ -61,7 +61,7 @@ namespace NzbDrone.Core.DataAugmentation.Xem
             var response = restClient.ExecuteAndValidate<XemResult<List<XemSceneTvdbMapping>>>(request);
             CheckForFailureResult(response);
 
-            return response.Data;
+            return response.Data.Where(c => c.Scene != null).ToList();
         }
 
         private static void CheckForFailureResult<T>(XemResult<T> response)