diff --git a/src/NzbDrone.Core/Download/Clients/Nzbget/Nzbget.cs b/src/NzbDrone.Core/Download/Clients/Nzbget/Nzbget.cs
index e99382894..6dd047f4c 100644
--- a/src/NzbDrone.Core/Download/Clients/Nzbget/Nzbget.cs
+++ b/src/NzbDrone.Core/Download/Clients/Nzbget/Nzbget.cs
@@ -42,9 +42,8 @@ public override string Download(RemoteEpisode remoteEpisode)
         {
             var url = remoteEpisode.Release.DownloadUrl;
             var title = remoteEpisode.Release.Title + ".nzb";
-
-            string category = Settings.TvCategory;
-            int priority = remoteEpisode.IsRecentEpisode() ? Settings.RecentTvPriority : Settings.OlderTvPriority;
+            var category = Settings.TvCategory;
+            var priority = remoteEpisode.IsRecentEpisode() ? Settings.RecentTvPriority : Settings.OlderTvPriority;
 
             _logger.Info("Adding report [{0}] to the queue.", title);
 
@@ -271,10 +270,9 @@ public override void Test(NzbgetSettings settings)
             _proxy.GetVersion(settings);
 
             var config = _proxy.GetConfig(settings);
-
             var categories = GetCategories(config);
 
-            if (!categories.Any(v => v.Name == settings.TvCategory))
+            if (!settings.TvCategory.IsNullOrWhiteSpace() && !categories.Any(v => v.Name == settings.TvCategory))
             {
                 throw new ApplicationException("Category does not exist");
             }
diff --git a/src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs b/src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs
index e14c15336..5c5a05e31 100644
--- a/src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs
+++ b/src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs
@@ -222,7 +222,7 @@ public override void Test(SabnzbdSettings settings)
         {
             var categories = _proxy.GetCategories(settings);
 
-            if (!categories.Any(v => v == settings.TvCategory))
+            if (!settings.TvCategory.IsNullOrWhiteSpace() && !categories.Any(v => v == settings.TvCategory))
             {
                 throw new ApplicationException("Category does not exist");
             }