diff --git a/desktop/src/features/messages/lib/useMentions.ts b/desktop/src/features/messages/lib/useMentions.ts
index 945ff33824..ab0f9c3704 100644
--- a/desktop/src/features/messages/lib/useMentions.ts
+++ b/desktop/src/features/messages/lib/useMentions.ts
@@ -209,7 +209,11 @@ export function useMentions(
       if (isArchivedDiscovery(pubkey)) {
         return;
       }
-      if (candidate.isAgent && !mentionableAgentPubkeys.has(pubkey)) {
+      if (
+        candidate.isAgent &&
+        !candidate.isMember &&
+        !mentionableAgentPubkeys.has(pubkey)
+      ) {
         return;
       }