diff --git a/package-lock.json b/package-lock.json
index 988812347b..a1da399f71 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": "7.1.3",
+        "@signalapp/mock-server": "8.0.1",
         "@storybook/addon-a11y": "8.1.11",
         "@storybook/addon-actions": "8.1.11",
         "@storybook/addon-controls": "8.1.11",
@@ -7296,9 +7296,9 @@
       }
     },
     "node_modules/@signalapp/mock-server": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/@signalapp/mock-server/-/mock-server-7.1.3.tgz",
-      "integrity": "sha512-Xvpeai+E0mhz6WHSycYuY31y5saCNJYX7ioDn1Q0LqUAOUKGVQjnWvdxeXLPKv8C06mbWn0lP16o9swClWVsmg==",
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/@signalapp/mock-server/-/mock-server-8.0.1.tgz",
+      "integrity": "sha512-qfyBOtMmQ3RF3Kig0DTafrxUx8MZ2hB+5H6ZJVV1lQS022U6bOHiVjZyAJ0uZgU98FJZIXlT/zWJ24kFl6/pGQ==",
       "dev": true,
       "license": "AGPL-3.0-only",
       "dependencies": {
diff --git a/package.json b/package.json
index 23ebbbaf3d..8e550412d6 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": "7.1.3",
+    "@signalapp/mock-server": "8.0.1",
     "@storybook/addon-a11y": "8.1.11",
     "@storybook/addon-actions": "8.1.11",
     "@storybook/addon-controls": "8.1.11",
diff --git a/ts/services/backups/import.ts b/ts/services/backups/import.ts
index 0f6f711152..0d3eceee95 100644
--- a/ts/services/backups/import.ts
+++ b/ts/services/backups/import.ts
@@ -566,6 +566,8 @@ export class BackupImportStream extends Writable {
 
     strictAssert(Bytes.isNotEmpty(profileKey), 'Missing profile key');
     await storage.put('profileKey', profileKey);
+    this.ourConversation.profileKey = Bytes.toBase64(profileKey);
+    await this.updateConversation(this.ourConversation);
 
     if (username != null) {
       me.username = username;
diff --git a/ts/test-mock/benchmarks/backup_bench.ts b/ts/test-mock/benchmarks/backup_bench.ts
index a8552dfb57..08fc9f0b3b 100644
--- a/ts/test-mock/benchmarks/backup_bench.ts
+++ b/ts/test-mock/benchmarks/backup_bench.ts
@@ -2,16 +2,11 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 /* eslint-disable no-console */
 
-import { pipeline } from 'node:stream/promises';
-import { createWriteStream } from 'node:fs';
-import { mkdir } from 'node:fs/promises';
-import { join } from 'node:path';
-
 import { Bootstrap } from './fixtures';
 import { generateBackup } from '../../test-both/helpers/generateBackup';
 
 Bootstrap.benchmark(async (bootstrap: Bootstrap): Promise<void> => {
-  const { phone, cdn3Path } = bootstrap;
+  const { phone, server } = bootstrap;
 
   const { backupId, stream: backupStream } = generateBackup({
     aci: phone.device.aci,
@@ -20,14 +15,8 @@ Bootstrap.benchmark(async (bootstrap: Bootstrap): Promise<void> => {
     conversations: 1000,
     messages: 60 * 1000,
   });
-  const backupFolder = join(
-    cdn3Path,
-    'backups',
-    backupId.toString('base64url')
-  );
-  await mkdir(backupFolder, { recursive: true });
-  const fileStream = createWriteStream(join(backupFolder, 'backup'));
-  await pipeline(backupStream, fileStream);
+
+  await server.storeBackupOnCdn(backupId, backupStream);
 
   const importStart = Date.now();
 
diff --git a/ts/test-mock/messaging/attachments_test.ts b/ts/test-mock/messaging/attachments_test.ts
index f02ce46cc7..07e4c638ec 100644
--- a/ts/test-mock/messaging/attachments_test.ts
+++ b/ts/test-mock/messaging/attachments_test.ts
@@ -168,7 +168,7 @@ describe('attachments', function (this: Mocha.Suite) {
       bootstrap.getAbsoluteAttachmentPath(ciphertextPath)
     );
 
-    bootstrap.server.storeAttachmentOnCdn(
+    await bootstrap.server.storeAttachmentOnCdn(
       cdnNumber,
       cdnKey,
       ciphertextCatWithNonZeroPadding
diff --git a/ts/util/uploadAttachment.ts b/ts/util/uploadAttachment.ts
index a9348bc3d7..0615b1cd54 100644
--- a/ts/util/uploadAttachment.ts
+++ b/ts/util/uploadAttachment.ts
@@ -95,9 +95,7 @@ export async function encryptAndUploadAttachment({
         uploadForm = await server.getAttachmentUploadForm();
         break;
       case 'backup':
-        uploadForm = await server.getBackupMediaUploadForm(
-          await backupsService.credentials.getHeadersForToday()
-        );
+        uploadForm = await backupsService.api.getMediaUploadForm();
         break;
       default:
         throw missingCaseError(uploadType);