diff --git a/src/Jackett.Common/Plumbing/JackettModule.cs b/src/Jackett.Common/Plumbing/JackettModule.cs
index e4cbc1054..93c40a802 100644
--- a/src/Jackett.Common/Plumbing/JackettModule.cs
+++ b/src/Jackett.Common/Plumbing/JackettModule.cs
@@ -42,10 +42,15 @@ namespace Jackett.Common.Plumbing
             // Register the best web client for the platform or the override
             switch (_runtimeSettings.ClientOverride)
             {
+                case "httpclientnetcore":
+                case "httpclient":
+                    RegisterWebClient<HttpWebClient>(builder);
+                    break;
+                case "httpclient2netcore":
                 case "httpclient2":
                     RegisterWebClient<HttpWebClient2>(builder);
                     break;
-                default: // "httpclient"
+                default:
                     RegisterWebClient<HttpWebClient>(builder);
                     break;
             }
diff --git a/src/Jackett.Server/Initialisation.cs b/src/Jackett.Server/Initialisation.cs
index 63d2cf6c6..ed26c080d 100644
--- a/src/Jackett.Server/Initialisation.cs
+++ b/src/Jackett.Server/Initialisation.cs
@@ -11,7 +11,7 @@ namespace Jackett.Server
     {
         public static void ProcessSettings(RuntimeSettings runtimeSettings, Logger logger)
         {
-            if (runtimeSettings.ClientOverride != "httpclient" && runtimeSettings.ClientOverride != "httpclient2")
+            if (runtimeSettings.ClientOverride != "httpclient" && runtimeSettings.ClientOverride != "httpclient2" && runtimeSettings.ClientOverride != "httpclientnetcore" && runtimeSettings.ClientOverride != "httpclient2netcore")
             {
                 logger.Error($"Client override ({runtimeSettings.ClientOverride}) has been deprecated, please remove it from your start arguments");
                 Environment.Exit(1);
diff --git a/src/Jackett.Server/Program.cs b/src/Jackett.Server/Program.cs
index 4e44e7282..c94d0ec98 100644
--- a/src/Jackett.Server/Program.cs
+++ b/src/Jackett.Server/Program.cs
@@ -46,7 +46,16 @@ namespace Jackett.Server
             optionsResult.WithParsed(options =>
             {
                 if (string.IsNullOrEmpty(options.Client))
-                    options.Client = DotNetCoreUtil.IsRunningOnDotNetCore ? "httpclient2" : "httpclient";
+                {
+                    if (DotNetCoreUtil.IsRunningOnDotNetCore)
+                    {
+                        options.Client = "httpclient2netcore";
+                    }
+                    else
+                    {
+                        options.Client = "httpclient";
+                    }
+                }
 
                 Settings = options.ToRunTimeSettings();
                 consoleOptions = options;