From 42e4c24d86e98b8b749a6cef98e8a55cbe42de68 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Thu, 21 Jun 2018 10:11:58 -0300
Subject: [PATCH] Fix mentions

---
 packages/rocketchat-mentions/Mentions.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 }<a class="mention-link mention-link-me mention-link-all">@${ username }</a>`;
 			}
 
-			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;
 			}