diff --git a/Emby.Server.Implementations/IStartupOptions.cs b/Emby.Server.Implementations/IStartupOptions.cs
index a3a047057d..5d22bfddc9 100644
--- a/Emby.Server.Implementations/IStartupOptions.cs
+++ b/Emby.Server.Implementations/IStartupOptions.cs
@@ -1,3 +1,5 @@
+using System;
+
 namespace Emby.Server.Implementations
 {
     public interface IStartupOptions
@@ -40,6 +42,6 @@ namespace Emby.Server.Implementations
         /// <summary>
         /// Gets the value of the --auto-discover-publish-url command line option.
         /// </summary>
-        string AutoDiscoverPublishUrl { get; }
+        Uri PublishedServerUrl { get; }
     }
 }
diff --git a/Emby.Server.Implementations/Udp/UdpServer.cs b/Emby.Server.Implementations/Udp/UdpServer.cs
index 57228d208d..1ae3888dc4 100644
--- a/Emby.Server.Implementations/Udp/UdpServer.cs
+++ b/Emby.Server.Implementations/Udp/UdpServer.cs
@@ -27,7 +27,7 @@ namespace Emby.Server.Implementations.Udp
         /// <summary>
         /// Address Override Configuration Key
         /// </summary>
-        public const string AddressOverrideConfigKey = "AutoDiscoverAddressOverride";
+        public const string AddressOverrideConfigKey = "PublishedServerUrl";
 
         private Socket _udpSocket;
         private IPEndPoint _endpoint;
@@ -47,17 +47,9 @@ namespace Emby.Server.Implementations.Udp
 
         private async Task RespondToV2Message(string messageText, EndPoint endpoint, CancellationToken cancellationToken)
         {
-            string localUrl;
-
-            if (!string.IsNullOrEmpty(_config[AddressOverrideConfigKey]))
-            {
-                localUrl = _config[AddressOverrideConfigKey];
-            }
-            else
-            {
-                localUrl = await _appHost.GetLocalApiUrl(cancellationToken).ConfigureAwait(false);
-            }
-
+            string localUrl = !string.IsNullOrEmpty(_config[AddressOverrideConfigKey])
+                ? _config[AddressOverrideConfigKey]
+                : await _appHost.GetLocalApiUrl(cancellationToken).ConfigureAwait(false);
 
             if (!string.IsNullOrEmpty(localUrl))
             {
diff --git a/Jellyfin.Server/StartupOptions.cs b/Jellyfin.Server/StartupOptions.cs
index 135ba9d7f8..cc250b06e2 100644
--- a/Jellyfin.Server/StartupOptions.cs
+++ b/Jellyfin.Server/StartupOptions.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using CommandLine;
 using Emby.Server.Implementations;
@@ -83,8 +84,8 @@ namespace Jellyfin.Server
         public string? PluginManifestUrl { get; set; }
 
         /// <inheritdoc />
-        [Option("auto-discover-publish-url", Required = false, HelpText = "Jellyfin Server URL to publish via auto discover process")]
-        public string? AutoDiscoverPublishUrl { get; set; }
+        [Option("published-server-url", Required = false, HelpText = "Jellyfin Server URL to publish via auto discover process")]
+        public Uri? PublishedServerUrl { get; set; }
 
         /// <summary>
         /// Gets the command line options as a dictionary that can be used in the .NET configuration system.
@@ -104,9 +105,9 @@ namespace Jellyfin.Server
                 config.Add(ConfigurationExtensions.HostWebClientKey, bool.FalseString);
             }
 
-            if (AutoDiscoverPublishUrl != null)
+            if (PublishedServerUrl != null)
             {
-                config.Add(UdpServer.AddressOverrideConfigKey, AutoDiscoverPublishUrl);
+                config.Add(UdpServer.AddressOverrideConfigKey, PublishedServerUrl.ToString());
             }
 
             return config;