diff --git a/src/NzbDrone.Core/DataAugmentation/Scene/SceneMappingService.cs b/src/NzbDrone.Core/DataAugmentation/Scene/SceneMappingService.cs
index 5aa7f8c41..560d0b13d 100644
--- a/src/NzbDrone.Core/DataAugmentation/Scene/SceneMappingService.cs
+++ b/src/NzbDrone.Core/DataAugmentation/Scene/SceneMappingService.cs
@@ -112,14 +112,20 @@ namespace NzbDrone.Core.DataAugmentation.Scene
                     {
                         _repository.Clear(sceneMappingProvider.GetType().Name);
 
-                        foreach (var sceneMapping in mappings)
+                        mappings.RemoveAll(sceneMapping =>
                         {
                             if (sceneMapping.ParseTerm.IsNullOrWhiteSpace() ||
                                 sceneMapping.SearchTerm.IsNullOrWhiteSpace())
                             {
                                 _logger.Warn("Invalid scene mapping found for: {0}, skipping", sceneMapping.TvdbId);
+                                return true;
                             }
 
+                            return false;
+                        });
+
+                        foreach (var sceneMapping in mappings)
+                        {
                             sceneMapping.ParseTerm = sceneMapping.Title.CleanSeriesTitle();
                             sceneMapping.Type = sceneMappingProvider.GetType().Name;
                         }