1 files changed, 4 insertions, 4 deletions
diff --git a/webapp/components/suggestion/at_mention_provider.jsx b/webapp/components/suggestion/at_mention_provider.jsx
index ddf9d46e7..4d55e9db6 100644
--- a/webapp/components/suggestion/at_mention_provider.jsx
+++ b/webapp/components/suggestion/at_mention_provider.jsx
@@ -127,14 +127,14 @@ export default class AtMentionProvider extends Provider {
                     return;
                 }
 
-                const members = data.in_channel;
+                const members = Object.assign([], data.users);
                 for (const id of Object.keys(members)) {
-                    members[id].type = Constants.MENTION_MEMBERS;
+                    members[id] = {...members[id], type: Constants.MENTION_MEMBERS};
                 }
 
-                const nonmembers = data.out_of_channel;
+                const nonmembers = data.out_of_channel || [];
                 for (const id of Object.keys(nonmembers)) {
-                    nonmembers[id].type = Constants.MENTION_NONMEMBERS;
+                    nonmembers[id] = {...nonmembers[id], type: Constants.MENTION_NONMEMBERS};
                 }
 
                 let specialMentions = [];