diff --git a/package.json b/package.json
index a4b435be8d..1536540463 100644
--- a/package.json
+++ b/package.json
@@ -239,7 +239,7 @@
     "@indutny/parallel-prettier": "3.0.0",
     "@indutny/rezip-electron": "3.0.2",
     "@napi-rs/canvas": "0.1.61",
-    "@signalapp/mock-server": "15.2.0",
+    "@signalapp/mock-server": "15.2.3",
     "@storybook/addon-a11y": "8.4.4",
     "@storybook/addon-actions": "8.4.4",
     "@storybook/addon-controls": "8.4.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 06e3ae282d..63fb766e56 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -439,8 +439,8 @@ importers:
         specifier: 0.1.61
         version: 0.1.61
       '@signalapp/mock-server':
-        specifier: 15.2.0
-        version: 15.2.0(bufferutil@4.0.9)(utf-8-validate@5.0.10)
+        specifier: 15.2.3
+        version: 15.2.3(bufferutil@4.0.9)(utf-8-validate@5.0.10)
       '@storybook/addon-a11y':
         specifier: 8.4.4
         version: 8.4.4(storybook@8.4.4(bufferutil@4.0.9)(prettier@3.7.4)(utf-8-validate@5.0.10))
@@ -3492,8 +3492,8 @@ packages:
   '@signalapp/minimask@1.0.1':
     resolution: {integrity: sha512-QAwo0joA60urTNbW9RIz6vLKQjy+jdVtH7cvY0wD9PVooD46MAjE40MLssp4xUJrph91n2XvtJ3pbEUDrmT2AA==}
 
-  '@signalapp/mock-server@15.2.0':
-    resolution: {integrity: sha512-LblOdSmv9jeR2HVOaX8kvbdw95z3+T2Pc2gxLlCriIbSo5XUd9u7NFqk7mbcphIfAb6xwchWxCIhPBglVUwnxQ==}
+  '@signalapp/mock-server@15.2.3':
+    resolution: {integrity: sha512-/mohwJK5X50Y8pYPRNCG3Noi6VNtVstEnVmEbbL01XLz+2GH0iKa8e1F1XDkqYVfu13Gl8U7o6k/oYo4NP57sA==}
 
   '@signalapp/parchment-cjs@3.0.1':
     resolution: {integrity: sha512-hSBMQ1M7wE4GcC8ZeNtvpJF+DAJg3eIRRf1SiHS3I3Algav/sgJJNm6HIYm6muHuK7IJmuEjkL3ILSXgmu0RfQ==}
@@ -14278,7 +14278,7 @@ snapshots:
 
   '@signalapp/minimask@1.0.1': {}
 
-  '@signalapp/mock-server@15.2.0(bufferutil@4.0.9)(utf-8-validate@5.0.10)':
+  '@signalapp/mock-server@15.2.3(bufferutil@4.0.9)(utf-8-validate@5.0.10)':
     dependencies:
       '@indutny/parallel-prettier': 3.0.0(prettier@3.7.4)
       '@signalapp/libsignal-client': 0.76.7
diff --git a/ts/background.preload.ts b/ts/background.preload.ts
index f2f90e915e..cf0a59e7f9 100644
--- a/ts/background.preload.ts
+++ b/ts/background.preload.ts
@@ -2323,16 +2323,12 @@ export async function startApp(): Promise<void> {
     processBatch(batch) {
       const deduped = new Set(batch);
       deduped.forEach(async sender => {
-        try {
-          if (!(await shouldRespondWithProfileKey(sender))) {
-            return;
-          }
-        } catch (error) {
-          log.error(
-            'respondWithProfileKeyBatcher error',
-            Errors.toLogFormat(error)
-          );
+        if (!shouldRespondWithProfileKey(sender)) {
+          return;
         }
+        sender.enableProfileSharing({
+          reason: 'shouldRespondWithProfileKey',
+        });
 
         drop(
           sender.queueJob('sendProfileKeyUpdate', () =>
diff --git a/ts/state/selectors/conversations.dom.ts b/ts/state/selectors/conversations.dom.ts
index 6a312c0b8a..7f53d7aea3 100644
--- a/ts/state/selectors/conversations.dom.ts
+++ b/ts/state/selectors/conversations.dom.ts
@@ -1352,6 +1352,7 @@ export function isMissingRequiredProfileSharing(
     !conversation.isMe &&
     !conversation.left &&
     !conversation.removalStage &&
+    !isInSystemContacts(conversation) &&
     (isGroupV1(conversation) || isDirectConversation(conversation));
 
   return Boolean(
diff --git a/ts/test-mock/benchmarks/send_bench.node.ts b/ts/test-mock/benchmarks/send_bench.node.ts
index 79cab7736c..567212659b 100644
--- a/ts/test-mock/benchmarks/send_bench.node.ts
+++ b/ts/test-mock/benchmarks/send_bench.node.ts
@@ -77,12 +77,6 @@ Bootstrap.benchmark(async (bootstrap: Bootstrap): Promise<void> => {
     '.timeline-wrapper, .Inbox__conversation .ConversationView'
   );
 
-  debug('accepting conversation');
-  await window.getByRole('button', { name: 'Continue' }).click();
-
-  const { dataMessage: profileKeyMsg } = await first.waitForMessage();
-  assert(profileKeyMsg.profileKey != null, 'Profile key message');
-
   const deltaList = new Array<number>();
   for (let runId = 0; runId < RUN_COUNT + DISCARD_COUNT; runId += 1) {
     debug('finding composition input and clicking it');
diff --git a/ts/test-mock/messaging/edit_test.node.ts b/ts/test-mock/messaging/edit_test.node.ts
index 0e5c1b22c8..f3aea80367 100644
--- a/ts/test-mock/messaging/edit_test.node.ts
+++ b/ts/test-mock/messaging/edit_test.node.ts
@@ -322,9 +322,6 @@ describe('editing', function (this: Mocha.Suite) {
       debug('checking for message');
       await window.locator('.module-message__text >> "hello"').waitFor();
 
-      debug('accepting conversation');
-      await window.getByRole('button', { name: 'Continue' }).click();
-
       const { dataMessage: profileKeyMsg } = await friend.waitForMessage();
       assert(profileKeyMsg.profileKey != null, 'Profile key message');
 
@@ -540,9 +537,6 @@ describe('editing', function (this: Mocha.Suite) {
         .click();
       await page.locator('.module-conversation-hero').waitFor();
 
-      debug('accepting conversation');
-      await page.getByRole('button', { name: 'Continue' }).click();
-
       const { dataMessage: profileKeyMsg } = await friend.waitForMessage();
       assert(profileKeyMsg.profileKey != null, 'Profile key message');