diff --git a/parser/pageparser/pagelexer.go b/parser/pageparser/pagelexer.go
index 5ee4fbf94..11723f279 100644
--- a/parser/pageparser/pagelexer.go
+++ b/parser/pageparser/pagelexer.go
@@ -223,7 +223,7 @@ func lexEmoji(l *pageLexer) stateFunc {
 			break
 		}
 		r, _ := utf8.DecodeRune(l.input[i:])
-		if !isAlphaNumeric(r) {
+		if !(isAlphaNumericOrHyphen(r) || r == '+') {
 			break
 		}
 	}