diff --git a/plugins/chat/app/services/chat/lookup_channel_threads.rb b/plugins/chat/app/services/chat/lookup_channel_threads.rb
index aa7664d9484..fa6efbd8a97 100644
--- a/plugins/chat/app/services/chat/lookup_channel_threads.rb
+++ b/plugins/chat/app/services/chat/lookup_channel_threads.rb
@@ -77,7 +77,7 @@ module Chat
             :uploads,
             :chat_webhook_event,
             :chat_channel,
-            chat_mentions: {
+            user_mentions: {
               user: :user_status,
             },
             user: :user_status,
@@ -86,7 +86,7 @@ module Chat
             :uploads,
             :chat_webhook_event,
             :chat_channel,
-            chat_mentions: {
+            user_mentions: {
               user: :user_status,
             },
             user: :user_status,
diff --git a/plugins/chat/app/services/chat/lookup_user_threads.rb b/plugins/chat/app/services/chat/lookup_user_threads.rb
index 139306a0d9d..0ffe5420414 100644
--- a/plugins/chat/app/services/chat/lookup_user_threads.rb
+++ b/plugins/chat/app/services/chat/lookup_user_threads.rb
@@ -55,7 +55,7 @@ module Chat
             :uploads,
             :chat_webhook_event,
             :chat_channel,
-            chat_mentions: {
+            user_mentions: {
               user: :user_status,
             },
             user: :user_status,
@@ -64,7 +64,7 @@ module Chat
             :uploads,
             :chat_webhook_event,
             :chat_channel,
-            chat_mentions: {
+            user_mentions: {
               user: :user_status,
             },
             user: :user_status,