diff --git a/lib/client/socket.ts b/lib/client/socket.ts
index cf2e63052..db23c7132 100644
--- a/lib/client/socket.ts
+++ b/lib/client/socket.ts
@@ -151,11 +151,11 @@ export const createWebSocket = (
     websocket.identifier = identifyingMetadata.identifier;
     websocket.supportedIntegrationType =
       identifyingMetadata.supportedIntegrationType || '';
-    websocket.serverId = serverId || '';
     websocket.friendlyName = identifyingMetadata.friendlyName || '';
   } else {
     websocket.identifier = maskToken(identifyingMetadata.identifier);
   }
+  websocket.serverId = serverId || '';
   websocket.clientConfig = identifyingMetadata.clientConfig;
   websocket.role = identifyingMetadata.role;
 
diff --git a/lib/hybrid-sdk/responseSenders.ts b/lib/hybrid-sdk/responseSenders.ts
index 23ac6a8e3..0b77f5da2 100644
--- a/lib/hybrid-sdk/responseSenders.ts
+++ b/lib/hybrid-sdk/responseSenders.ts
@@ -112,9 +112,7 @@ export class HybridResponseHandler {
         this.logContext,
         this.options,
         this.connectionIdentifier,
-        this.options.universalBrokerEnabled
-          ? this.websocketConnectionHandler?.serverId
-          : this.options.serverId,
+        this.websocketConnectionHandler?.serverId ?? '',
         this.requestMetadata.requestId,
         this.websocketConnectionHandler.role,
       );