diff --git a/src/components/MessageContent.js b/src/components/MessageContent.js
index 0968c2cc..464ea70f 100644
--- a/src/components/MessageContent.js
+++ b/src/components/MessageContent.js
@@ -59,7 +59,7 @@ function domToVue(createElement, node, context) {
 	}
 }
 
-const mentionRegex = /(\W|^)((@\w+)@[\w.-_]+)/i
+const mentionRegex = /(\W|^)((@\w+)@[\w.\-_]+)/ig
 const hashTagRegex = /(\W|^)(#\w+)/i
 
 /**