diff --git a/lib/client/auth/brokerServerConnection.ts b/lib/client/auth/brokerServerConnection.ts
index ef4f746e3..fb8ac8586 100644
--- a/lib/client/auth/brokerServerConnection.ts
+++ b/lib/client/auth/brokerServerConnection.ts
@@ -18,7 +18,7 @@ export const renewBrokerServerConnection = async (
   brokerServerConnectionParams: BrokerServerConnectionParams,
 ): Promise<HttpResponse> => {
   const clientConfig = getConfig();
-  const apiHostname = clientConfig.API_BASE_URL;
+  const apiHostname = clientConfig.apiHostname;
   const body = {
     data: {
       type: 'broker_connection',
diff --git a/lib/client/socket.ts b/lib/client/socket.ts
index 7e113bb9c..b9583223a 100644
--- a/lib/client/socket.ts
+++ b/lib/client/socket.ts
@@ -140,8 +140,6 @@ export const createWebSocket = (
     pong: parseInt(localClientOps.config.socketPongTimeout) || 10000,
     timeout: parseInt(localClientOps.config.socketConnectTimeout) || 10000,
   };
-  console.log('@@@@@@@@@@@@@@@@@@@@@2');
-  console.log(clientOpts.accessToken?.authHeader);
   if (clientOpts.accessToken && clientOpts.config.UNIVERSAL_BROKER_GA) {
     socketSettings['transport'] = {
       extraHeaders: {
@@ -281,10 +279,10 @@ export const createWebSocket = (
   });
 
   websocket.on('close', () => {
-    if (websocket.timeoutHandlerId) {
-      logger.debug({}, `Clearing ${maskToken(websocket.identifier)} timers.`);
-      clearTimeout(websocket.timeoutHandlerId);
-    }
+    // if (websocket.timeoutHandlerId) {
+    //   logger.debug({}, `Clearing ${maskToken(websocket.identifier)} timers.`);
+    //   clearTimeout(websocket.timeoutHandlerId);
+    // }
     closeHandler(localClientOps, identifyingMetadata);
   });
 
diff --git a/lib/hybrid-sdk/http/downstream-post-stream-to-server.ts b/lib/hybrid-sdk/http/downstream-post-stream-to-server.ts
index a6bb8ada1..06cc5473f 100644
--- a/lib/hybrid-sdk/http/downstream-post-stream-to-server.ts
+++ b/lib/hybrid-sdk/http/downstream-post-stream-to-server.ts
@@ -66,7 +66,7 @@ class BrokerServerPostResponseHandler {
     try {
       const backendHostname =
         this.#config.universalBrokerEnabled && this.#config.universalBrokerGa
-          ? `${this.#config.apiHostname}/hidden/broker`
+          ? `${this.#config.apiHostname}/hidden/brokers`
           : this.#config.brokerServerUrl;
       const url = new URL(
         `${backendHostname}/response-data/${this.#brokerToken}/${
diff --git a/lib/server/index.ts b/lib/server/index.ts
index 46aea90d0..1f65a6672 100644
--- a/lib/server/index.ts
+++ b/lib/server/index.ts
@@ -72,7 +72,7 @@ export const main = async (serverOpts: ServerOpts) => {
       authRefreshHandler,
     );
     app.post(
-      '/hidden/broker/response-data/:brokerToken/:streamingId',
+      '/hidden/brokers/response-data/:brokerToken/:streamingId',
       handlePostResponse,
     );