diff --git a/package-lock.json b/package-lock.json
index 3a6ecc97b4f0..ab448f59b01c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -126,7 +126,7 @@
         "@indutny/parallel-prettier": "3.0.0",
         "@indutny/rezip-electron": "1.3.1",
         "@indutny/symbolicate-mac": "2.3.0",
-        "@signalapp/mock-server": "6.11.0",
+        "@signalapp/mock-server": "7.0.1",
         "@storybook/addon-a11y": "8.1.11",
         "@storybook/addon-actions": "8.1.11",
         "@storybook/addon-controls": "8.1.11",
@@ -7274,9 +7274,9 @@
       }
     },
     "node_modules/@signalapp/mock-server": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/@signalapp/mock-server/-/mock-server-6.11.0.tgz",
-      "integrity": "sha512-wIPUtsLcngcum0dkGuJ1YfTuWso7DhH0JZUA5ZS82XlmF2Qz0ZF03AdeeNcQx4XY4mJU1+nIEhTZpB0AFqEM4Q==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/@signalapp/mock-server/-/mock-server-7.0.1.tgz",
+      "integrity": "sha512-iwH57apXyTHKjozaV1ZJW6nbVhFH3KlVOQYaJiO2bT3YgAGdYoJvHp8+MMIQ8OFYVGRo3g7wouqX/JT5HElAvw==",
       "dev": true,
       "license": "AGPL-3.0-only",
       "dependencies": {
diff --git a/package.json b/package.json
index 7767fcbce962..7967bb0a39be 100644
--- a/package.json
+++ b/package.json
@@ -210,7 +210,7 @@
     "@indutny/parallel-prettier": "3.0.0",
     "@indutny/rezip-electron": "1.3.1",
     "@indutny/symbolicate-mac": "2.3.0",
-    "@signalapp/mock-server": "6.11.0",
+    "@signalapp/mock-server": "7.0.1",
     "@storybook/addon-a11y": "8.1.11",
     "@storybook/addon-actions": "8.1.11",
     "@storybook/addon-controls": "8.1.11",
diff --git a/ts/textsecure/SocketManager.ts b/ts/textsecure/SocketManager.ts
index 13b4185ffa2f..c77eb9f03502 100644
--- a/ts/textsecure/SocketManager.ts
+++ b/ts/textsecure/SocketManager.ts
@@ -42,6 +42,7 @@ import { ConnectTimeoutError, HTTPError } from './Errors';
 import type { IRequestHandler, WebAPICredentials } from './Types.d';
 import { connect as connectWebSocket } from './WebSocket';
 import { isAlpha, isBeta, isStaging } from '../util/version';
+import { getBasicAuth } from '../util/getBasicAuth';
 
 const FIVE_MINUTES = 5 * durations.MINUTE;
 
@@ -192,7 +193,6 @@ export class SocketManager extends EventListener {
       : this.connectResource({
           name: AUTHENTICATED_CHANNEL_NAME,
           path: '/v1/websocket/',
-          query: { login: username, password },
           resourceOptions: {
             name: AUTHENTICATED_CHANNEL_NAME,
             keepalive: { path: '/v1/keepalive' },
@@ -201,6 +201,7 @@ export class SocketManager extends EventListener {
             },
           },
           extraHeaders: {
+            Authorization: getBasicAuth({ username, password }),
             'X-Signal-Receive-Stories': String(!this.hasStoriesDisabled),
           },
           proxyAgent,