diff --git a/app/src/main/java/com/nextcloud/talk/presenters/MentionAutocompletePresenter.java b/app/src/main/java/com/nextcloud/talk/presenters/MentionAutocompletePresenter.java
index aaade89a7..58301e9e3 100644
--- a/app/src/main/java/com/nextcloud/talk/presenters/MentionAutocompletePresenter.java
+++ b/app/src/main/java/com/nextcloud/talk/presenters/MentionAutocompletePresenter.java
@@ -79,7 +79,7 @@ public class MentionAutocompletePresenter extends RecyclerViewPresenter<Mention>
 
     @Override
     protected RecyclerView.Adapter instantiateAdapter() {
-        adapter = new FlexibleAdapter<>(abstractFlexibleItemList, context, true);
+        adapter = new FlexibleAdapter<>(abstractFlexibleItemList, context, false);
         adapter.addListener(this);
         return adapter;
     }
@@ -115,6 +115,10 @@ public class MentionAutocompletePresenter extends RecyclerViewPresenter<Mention>
                                                     currentUser));
                                 }
 
+                                if (adapter.getItemCount() != 0) {
+                                    adapter.clear();
+                                }
+
                                 adapter.updateDataSet(internalAbstractFlexibleItemList);
                             }
                         }