diff --git a/packages/rocketchat-mentions/Mentions.js b/packages/rocketchat-mentions/Mentions.js index 9e3e41cada79a..3c3c1fc1f4b02 100644 --- a/packages/rocketchat-mentions/Mentions.js +++ b/packages/rocketchat-mentions/Mentions.js @@ -39,7 +39,7 @@ export default class { return `${ prefix }@${ username }`; } - const mentionObj = message.mentions.find(m => m.username === username); + const mentionObj = message.mentions && message.mentions.find(m => m.username === username); if (message.temp == null && mentionObj == null) { return match; }