diff --git a/src/NzbDrone.Core/Download/DownloadClientProvider.cs b/src/NzbDrone.Core/Download/DownloadClientProvider.cs
index c6d58b1b2..314ac783b 100644
--- a/src/NzbDrone.Core/Download/DownloadClientProvider.cs
+++ b/src/NzbDrone.Core/Download/DownloadClientProvider.cs
@@ -38,6 +38,10 @@ public DownloadClientProvider(IDownloadClientStatusService downloadClientStatusS
 
         public IDownloadClient GetDownloadClient(DownloadProtocol downloadProtocol, int indexerId = 0, bool filterBlockedClients = false, HashSet<int> tags = null)
         {
+            // Tags aren't required, but download clients with tags should not be picked unless there is at least one matching tag.
+            // Defaulting to an empty HashSet ensures this is always checked.
+            tags ??= new HashSet<int>();
+
             var blockedProviders = new HashSet<int>(_downloadClientStatusService.GetBlockedProviders().Select(v => v.ProviderId));
             var availableProviders = _downloadClientFactory.GetAvailableProviders().Where(v => v.Protocol == downloadProtocol).ToList();
 
@@ -46,18 +50,15 @@ public IDownloadClient GetDownloadClient(DownloadProtocol downloadProtocol, int
                 return null;
             }
 
-            if (tags is { Count: > 0 })
+            var matchingTagsClients = availableProviders.Where(i => i.Definition.Tags.Intersect(tags).Any()).ToList();
+
+            availableProviders = matchingTagsClients.Count > 0 ?
+                matchingTagsClients :
+                availableProviders.Where(i => i.Definition.Tags.Empty()).ToList();
+
+            if (!availableProviders.Any())
             {
-                var matchingTagsClients = availableProviders.Where(i => i.Definition.Tags.Intersect(tags).Any()).ToList();
-
-                availableProviders = matchingTagsClients.Count > 0 ?
-                    matchingTagsClients :
-                    availableProviders.Where(i => i.Definition.Tags.Empty()).ToList();
-
-                if (!availableProviders.Any())
-                {
-                    throw new DownloadClientUnavailableException("No download client was found without tags or a matching artist tag. Please check your settings.");
-                }
+                throw new DownloadClientUnavailableException("No download client was found without tags or a matching artist tag. Please check your settings.");
             }
 
             if (indexerId > 0)