diff --git a/library/TokenAutoComplete/src/main/java/com/tokenautocomplete/TokenCompleteTextView.java b/library/TokenAutoComplete/src/main/java/com/tokenautocomplete/TokenCompleteTextView.java
index 35c7abf38fb..f3950ad960d 100644
--- a/library/TokenAutoComplete/src/main/java/com/tokenautocomplete/TokenCompleteTextView.java
+++ b/library/TokenAutoComplete/src/main/java/com/tokenautocomplete/TokenCompleteTextView.java
@@ -146,10 +146,8 @@ public CharSequence filter(CharSequence source, int start, int end,
 
                 //Detect split characters, remove them and complete the current token instead
                 if (tokenizer.containsTokenTerminator(source)) {
-                    if (currentCompletionText().length() > 0) {
-                        performCompletion();
-                        return "";
-                    }
+                    performCompletion();
+                    return "";
                 }
 
                 return null;