diff --git a/app/assets/javascripts/discourse/lib/link-mentions.js.es6 b/app/assets/javascripts/discourse/lib/link-mentions.js.es6
index 68d0b8b5d6f..f3bbbe37972 100644
--- a/app/assets/javascripts/discourse/lib/link-mentions.js.es6
+++ b/app/assets/javascripts/discourse/lib/link-mentions.js.es6
@@ -46,7 +46,7 @@ function updateFound($mentions, usernames) {
       const username = usernames[i];
       if (found[username.toLowerCase()]) {
         replaceSpan($e, username, { cannot_see: cannotSee[username] });
-      } else if (foundGroups[username]) {
+      } else if (mentionableGroups[username]) {
         replaceSpan($e, username, {
           group: true,
           mentionable: mentionableGroups[username]
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index ac6d16f13c8..64b1152a1f7 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -308,7 +308,7 @@ class UsersController < ApplicationController
     groups = Group.where(name: usernames).pluck(:name)
     mentionable_groups =
       if current_user
-        Group.mentionable
+        Group.mentionable(current_user)
           .where(name: usernames)
           .pluck(:name, :user_count)
           .map do |name, user_count|