diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 4fc2cbfdc0500308de81ba7075d1433a7d6b3737..48f93b28545e0b6f6f6689cb39f45ef472163888 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -1573,6 +1573,7 @@ public class ConversationFragment extends XmppFragment
                         allUsers.add(u);
                     }
                     final String needle = query.toString().toLowerCase(Locale.getDefault());
+                    if (getRecyclerView() != null) getRecyclerView().setItemAnimator(null);
                     adapter.submitList(
                         Ordering.natural().immutableSortedCopy(Collections2.filter(
                             allUsers,