diff --git a/src/TributeRange.js b/src/TributeRange.js
index 6fddc8fd..de9faca1 100644
--- a/src/TributeRange.js
+++ b/src/TributeRange.js
@@ -125,7 +125,7 @@ class TributeRange {
                     : ' '
                 text += textSuffix
                 let startPos = info.mentionPosition
-                let endPos = info.mentionPosition + info.mentionText.length + textSuffix.length
+                let endPos = info.mentionPosition + info.mentionText.length + (textSuffix === '' ? 1 : textSuffix.length)
                 if (!this.tribute.autocompleteMode) {
                     endPos += info.mentionTriggerChar.length - 1
                 }