diff --git a/Emby.Server.Implementations/Udp/UdpServer.cs b/Emby.Server.Implementations/Udp/UdpServer.cs
index d01184e0b6..db5265e79d 100644
--- a/Emby.Server.Implementations/Udp/UdpServer.cs
+++ b/Emby.Server.Implementations/Udp/UdpServer.cs
@@ -53,12 +53,7 @@ namespace Emby.Server.Implementations.Udp
 
             if (!string.IsNullOrEmpty(localUrl))
             {
-                var response = new ServerDiscoveryInfo
-                {
-                    Address = localUrl,
-                    Id = _appHost.SystemId,
-                    Name = _appHost.FriendlyName
-                };
+                var response = new ServerDiscoveryInfo(localUrl, _appHost.SystemId, _appHost.FriendlyName);
 
                 try
                 {
diff --git a/MediaBrowser.Model/ApiClient/ServerDiscoveryInfo.cs b/MediaBrowser.Model/ApiClient/ServerDiscoveryInfo.cs
index fcc90a1f7a..f9f4745864 100644
--- a/MediaBrowser.Model/ApiClient/ServerDiscoveryInfo.cs
+++ b/MediaBrowser.Model/ApiClient/ServerDiscoveryInfo.cs
@@ -1,32 +1,43 @@
-#nullable disable
-#pragma warning disable CS1591
-
 namespace MediaBrowser.Model.ApiClient
 {
+    /// <summary>
+    /// The server discovery info model.
+    /// </summary>
     public class ServerDiscoveryInfo
     {
         /// <summary>
-        /// Gets or sets the address.
+        /// Initializes a new instance of the <see cref="ServerDiscoveryInfo"/> class.
+        /// </summary>
+        /// <param name="address">The server address.</param>
+        /// <param name="id">The server id.</param>
+        /// <param name="name">The server name.</param>
+        /// <param name="endpointAddress">The endpoint address.</param>
+        public ServerDiscoveryInfo(string address, string id, string name, string? endpointAddress = null)
+        {
+            Address = address;
+            Id = id;
+            Name = name;
+            EndpointAddress = endpointAddress;
+        }
+
+        /// <summary>
+        /// Gets the address.
         /// </summary>
-        /// <value>The address.</value>
-        public string Address { get; set; }
+        public string Address { get; }
 
         /// <summary>
-        /// Gets or sets the server identifier.
+        /// Gets the server identifier.
         /// </summary>
-        /// <value>The server identifier.</value>
-        public string Id { get; set; }
+        public string Id { get; }
 
         /// <summary>
-        /// Gets or sets the name.
+        /// Gets the name.
         /// </summary>
-        /// <value>The name.</value>
-        public string Name { get; set; }
+        public string Name { get; }
 
         /// <summary>
-        /// Gets or sets the endpoint address.
+        /// Gets the endpoint address.
         /// </summary>
-        /// <value>The endpoint address.</value>
-        public string EndpointAddress { get; set; }
+        public string? EndpointAddress { get; }
     }
 }