diff --git a/src/NzbDrone.Core/Indexers/IndexerHttpClient.cs b/src/NzbDrone.Core/Indexers/IndexerHttpClient.cs
index 34e8715f4..b3a605094 100644
--- a/src/NzbDrone.Core/Indexers/IndexerHttpClient.cs
+++ b/src/NzbDrone.Core/Indexers/IndexerHttpClient.cs
@@ -8,6 +8,7 @@
 using NzbDrone.Common.Http.Dispatchers;
 using NzbDrone.Common.TPL;
 using NzbDrone.Core.IndexerProxies;
+using NzbDrone.Core.IndexerProxies.FlareSolverr;
 using NzbDrone.Core.ThingiProvider;
 
 namespace NzbDrone.Core.Indexers
@@ -53,7 +54,7 @@ public HttpResponse ExecuteProxied(HttpRequest request, ProviderDefinition defin
         private IIndexerProxy GetProxy(ProviderDefinition definition)
         {
             //Skip DB call if no tags on the indexers
-            if (definition.Tags.Count == 0)
+            if (definition.Tags.Count == 0 && definition.Id > 0)
             {
                 return null;
             }
@@ -70,6 +71,11 @@ private IIndexerProxy GetProxy(ProviderDefinition definition)
                 }
             }
 
+            if (selectedProxy == null && definition.Id == 0)
+            {
+                selectedProxy = proxies.FirstOrDefault(p => p is FlareSolverr);
+            }
+
             return selectedProxy;
         }