diff --git a/library/src/main/java/com/tokenautocomplete/TokenCompleteTextView.java b/library/src/main/java/com/tokenautocomplete/TokenCompleteTextView.java
index 06a5eae5..fe9c8ccc 100644
--- a/library/src/main/java/com/tokenautocomplete/TokenCompleteTextView.java
+++ b/library/src/main/java/com/tokenautocomplete/TokenCompleteTextView.java
@@ -217,7 +217,11 @@ protected void performFiltering(@NonNull CharSequence text, int start, int end,
         }
         Filter filter = getFilter();
         if (filter != null) {
-            filter.filter(text.subSequence(start, end), this);
+            if (hintVisible) {
+                filter.filter("");
+            } else {
+                filter.filter(text.subSequence(start, end), this);
+            }
         }
     }
 
@@ -447,7 +451,7 @@ public void invalidate() {
 
     @Override
     public boolean enoughToFilter() {
-        if (tokenizer == null) {
+        if (tokenizer == null || hintVisible) {
             return false;
         }