diff --git a/src/Ombi.Core/Engine/TvSearchEngine.cs b/src/Ombi.Core/Engine/TvSearchEngine.cs
index 253363ec1..bb674a35d 100644
--- a/src/Ombi.Core/Engine/TvSearchEngine.cs
+++ b/src/Ombi.Core/Engine/TvSearchEngine.cs
@@ -54,7 +54,16 @@ namespace Ombi.Core.Engine
 
             if (searchResult != null)
             {
-                return await ProcessResults(searchResult);
+                var retVal = new List<SearchTvShowViewModel>();
+                foreach (var tvMazeSearch in searchResult)
+                {
+                    if (tvMazeSearch.show.externals == null || !(tvMazeSearch.show.externals?.thetvdb.HasValue ?? false))
+                    {
+                        continue;
+                    }
+                    retVal.Add(await ProcessResult(tvMazeSearch));
+                }
+                return retVal;
             }
             return null;
         }
@@ -145,12 +154,16 @@ namespace Ombi.Core.Engine
             var retVal = new List<SearchTvShowViewModel>();
             foreach (var tvMazeSearch in items)
             {
-                var viewT = Mapper.Map<SearchTvShowViewModel>(tvMazeSearch);
-                retVal.Add(await ProcessResult(viewT));
+                retVal.Add(await ProcessResult(tvMazeSearch));
             }
             return retVal;
         }
 
+        private async Task<SearchTvShowViewModel> ProcessResult<T>(T tvMazeSearch)
+        {
+            return Mapper.Map<SearchTvShowViewModel>(tvMazeSearch);
+        }
+
         private async Task<SearchTvShowViewModel> ProcessResult(SearchTvShowViewModel item)
         {
             item.TheTvDbId = item.Id.ToString();