diff --git a/src/status_im/chat/models/mentions.cljs b/src/status_im/chat/models/mentions.cljs
index b9e3d13e87..0a421556c0 100644
--- a/src/status_im/chat/models/mentions.cljs
+++ b/src/status_im/chat/models/mentions.cljs
@@ -247,7 +247,10 @@
       (merge mentionable-users
              (mentionable-contacts-from-identites all-contacts public-key (keys community-members)))
 
-      :else (merge mentionable-users mentionable-contacts))))
+      (= chat-type constants/public-chat-type)
+      (merge mentionable-users (select-keys mentionable-contacts (keys mentionable-users)))
+
+      :else mentionable-users)))
 
 (def ending-chars "[\\s\\.,;:]")
 (def ending-chars-regex (re-pattern ending-chars))