diff --git a/Ombi.UI/Content/search.js b/Ombi.UI/Content/search.js
index 8b71215fb..8b9c10109 100644
--- a/Ombi.UI/Content/search.js
+++ b/Ombi.UI/Content/search.js
@@ -355,7 +355,7 @@ $(function () {
                 if (results.result) {
                     // It's on Netflix
                     $('#' + id + 'netflixTab')
-                        .html("<span class='label label-success'>Avaialble on Netflix</span>");
+                        .html("<a href='https://www.netflix.com/watch/"+results.netflixId+"' target='_blank'><span class='label label-success'>Avaialble on Netflix</span></a>");
                 }
             
         });
diff --git a/Ombi.UI/Modules/SearchExtensionModule.cs b/Ombi.UI/Modules/SearchExtensionModule.cs
index 05fdfe003..4c0ee4a6f 100644
--- a/Ombi.UI/Modules/SearchExtensionModule.cs
+++ b/Ombi.UI/Modules/SearchExtensionModule.cs
@@ -54,7 +54,7 @@ namespace Ombi.UI.Modules
                 return Response.AsJson(new { Result = false });
             }
 
-            return Response.AsJson(new { Result = true });
+            return Response.AsJson(new { Result = true, NetflixId = result.ShowId });
         }
 
 
diff --git a/Ombi.UI/Modules/SearchModule.cs b/Ombi.UI/Modules/SearchModule.cs
index 8759d0325..30acdf68a 100644
--- a/Ombi.UI/Modules/SearchModule.cs
+++ b/Ombi.UI/Modules/SearchModule.cs
@@ -246,6 +246,7 @@ namespace Ombi.UI.Modules
                 if (counter <= 5) // Let's only do it for the first 5 items
                 {
                     var movieInfoTask = await MovieApi.GetMovieInformation(movie.Id).ConfigureAwait(false);
+                    
                     // TODO needs to be careful about this, it's adding extra time to search...
                     // https://www.themoviedb.org/talk/5807f4cdc3a36812160041f2
                     imdbId = movieInfoTask?.ImdbId;
@@ -345,6 +346,10 @@ namespace Ombi.UI.Modules
             var viewTv = new List<SearchTvShowViewModel>();
             foreach (var t in apiTv)
             {
+                if (!(t.show.externals?.thetvdb.HasValue) ?? false)
+                {
+                    continue;
+                }
                 var banner = t.show.image?.medium;
                 if (!string.IsNullOrEmpty(banner))
                 {