diff --git a/desktop/src/features/messages/lib/useMentions.ts b/desktop/src/features/messages/lib/useMentions.ts
index b9737f1f398..28f70630373 100644
--- a/desktop/src/features/messages/lib/useMentions.ts
+++ b/desktop/src/features/messages/lib/useMentions.ts
@@ -257,7 +257,10 @@ export function useMentions(
       if (isArchivedDiscovery(pubkey)) {
         return;
       }
-      if (!isAgentIdentityInAllowedList(candidate, mentionableAgentPubkeys)) {
+      if (
+        candidate.isMember !== true &&
+        !isAgentIdentityInAllowedList(candidate, mentionableAgentPubkeys)
+      ) {
         return;
       }
       if (
diff --git a/desktop/tests/e2e/mentions.spec.ts b/desktop/tests/e2e/mentions.spec.ts
index ed00e8c3556..1de843b81f0 100644
--- a/desktop/tests/e2e/mentions.spec.ts
+++ b/desktop/tests/e2e/mentions.spec.ts
@@ -29,6 +29,8 @@ const CASEY_PROFILE_PUBKEY =
   "1111111111111111111111111111111111111111111111111111111111111111";
 const PROFILE_ONLY_AGENT_PUBKEY =
   "8f83d6b7f3d74f7d933ae3a54dd8c6cc85c7f98e531c16e5a827b953441a8d67";
+const UNSHARED_AGENT_PUBKEY =
+  "7f83d6b7f3d74f7d933ae3a54dd8c6cc85c7f98e531c16e5a827b953441a8d67";
 const OWNED_AGENT_PROFILE_PUBKEY =
   "1212121212121212121212121212121212121212121212121212121212121212";
 const SYSTEM_MESSAGE_KIND = 40099;
@@ -828,38 +830,72 @@ test("other-owned agents without a shared channel are hidden from mentions", asy
   await installMockBridge(page, {
     searchProfiles: [
       {
-        pubkey: PROFILE_ONLY_AGENT_PUBKEY,
-        displayName: "mira",
+        pubkey: UNSHARED_AGENT_PUBKEY,
+        displayName: "rhea",
         ownerPubkey: TEST_IDENTITIES.outsider.pubkey,
         isAgent: true,
       },
     ],
-    userSearchDelayMs: 1_000,
   });
   await page.goto("/");
   await page.getByTestId("channel-general").click();
   await expect(page.getByTestId("chat-title")).toHaveText("general");
 
   const input = page.getByTestId("message-input");
-  await input.fill("@mira");
+  await input.fill("@rhea");
+
+  await expect
+    .poll(async () =>
+      (await readCommandPayloadLog(page)).some(
+        (entry) =>
+          entry.command === "search_users" &&
+          (entry.payload as { query?: string }).query === "rhea",
+      ),
+    )
+    .toBe(true);
 
   const dropdown = autocomplete(page);
   await expect(dropdown).not.toBeVisible();
   await expect(input.locator(".mention-chip")).toHaveCount(0);
 });
 
-test("stale channel-member agents absent from managed and relay directories stay hidden", async ({
+test("other-owned channel-member agents absent from local directories emit a mention tag", async ({
   page,
 }) => {
-  await installMockBridge(page, { userSearchDelayMs: 1_000 });
+  await installMockBridge(page, {
+    searchProfiles: [
+      {
+        pubkey: PROFILE_ONLY_AGENT_PUBKEY,
+        displayName: "mira",
+        ownerPubkey: TEST_IDENTITIES.outsider.pubkey,
+        isAgent: true,
+      },
+    ],
+    userSearchDelayMs: 1_000,
+  });
   await page.goto("/");
   await page.getByTestId("channel-general").click();
   await expect(page.getByTestId("chat-title")).toHaveText("general");
 
   const input = page.getByTestId("message-input");
-  await input.fill("@mira");
+  await input.fill("Ask @mira");
 
-  await expect(autocomplete(page)).toHaveCount(0);
+  const miraRow = autocomplete(page).getByTestId(
+    `mention-suggestion-${PROFILE_ONLY_AGENT_PUBKEY}`,
+  );
+  await expect(miraRow).toBeVisible();
+  await expect(miraRow.getByTestId("mention-agent-icon")).toBeVisible();
+  await expect(miraRow.getByText("not in channel")).toHaveCount(0);
+  await miraRow.click();
+  await page.keyboard.type("please reply");
+
+  const content = "Ask @mira please reply";
+  await expect(input).toHaveText(content);
+  await page.getByTestId("send-message").click();
+
+  await expect
+    .poll(() => readOutgoingMentionPubkeys(page, content))
+    .toContain(PROFILE_ONLY_AGENT_PUBKEY);
 });
 
 test("managed relay agents are visible in channel mentions regardless of relay policy", async ({