diff --git a/assets/chat/js/formatters/MentionedUserFormatter.js b/assets/chat/js/formatters/MentionedUserFormatter.js
index 5f69fcd4..ef72515f 100644
--- a/assets/chat/js/formatters/MentionedUserFormatter.js
+++ b/assets/chat/js/formatters/MentionedUserFormatter.js
@@ -3,7 +3,7 @@ export default class MentionedUserFormatter {
     if (message && message.mentioned && message.mentioned.length > 0) {
       return str.replace(
         new RegExp(
-          `((?:^|\\s)@?)(${message.mentioned.join('|')})(?=$|\\s|[.?!,])`,
+          `((?:^|\\s)@?)(${message.mentioned.join('|')})(?=$|\\s|[.?!,'])`,
           'igm',
         ),
         `$1<span class="chat-user">$2</span>`,