diff --git a/src/Microsoft.Azure.SignalR.Common/Endpoints/ServiceEndpoint.cs b/src/Microsoft.Azure.SignalR.Common/Endpoints/ServiceEndpoint.cs
index 9a79d22b6..91f395c4e 100644
--- a/src/Microsoft.Azure.SignalR.Common/Endpoints/ServiceEndpoint.cs
+++ b/src/Microsoft.Azure.SignalR.Common/Endpoints/ServiceEndpoint.cs
@@ -13,9 +13,9 @@ public class ServiceEndpoint
 {
     private readonly Uri _serviceEndpoint;
 
-    private readonly Uri _serverEndpoint;
+    private readonly Uri? _serverEndpoint;
 
-    private readonly Uri _clientEndpoint;
+    private readonly Uri? _clientEndpoint;
 
     private readonly TokenCredential? _tokenCredential;
 
@@ -125,8 +125,8 @@ public ServiceEndpoint(string connectionString, EndpointType type = EndpointType
 
         _accessKey = result.AccessKey;
         _serviceEndpoint = result.Endpoint;
-        _clientEndpoint = result.ClientEndpoint ?? result.Endpoint;
-        _serverEndpoint = result.ServerEndpoint ?? result.Endpoint;
+        _clientEndpoint = result.ClientEndpoint;
+        _serverEndpoint = result.ServerEndpoint;
 
         Endpoint = BuildEndpointString(_serviceEndpoint);
         AudienceBaseUrl = BuildAudienceBaseUrlEndWithSlash(_serviceEndpoint);