diff --git a/web/react/utils/text_formatting.jsx b/web/react/utils/text_formatting.jsx
index 3a912fd75a..f0bd46f9dc 100644
--- a/web/react/utils/text_formatting.jsx
+++ b/web/react/utils/text_formatting.jsx
@@ -188,7 +188,7 @@ function highlightCurrentMentions(text, tokens) {
             const newAlias = `MM_SELFMENTION${index}`;
 
             newTokens.set(newAlias, {
-                value: `<span class='mention-highlight'>${alias}</span>` + token.extraText,
+                value: `<span class='mention-highlight'>${alias}</span>` + (token.extraText || ''),
                 originalText: token.originalText
             });
             output = output.replace(alias, newAlias);