diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index f1f4ce4cd..85fd597cc 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -1815,7 +1815,6 @@ public class ConversationFragment extends XmppFragment
 
                         @Override
                         protected void onQuery(@Nullable CharSequence query) {
-                            getRecyclerView().getItemAnimator().endAnimations();
                             final var allUsers = conversation.getMucOptions().getUsers();
                             if (!conversation.getMucOptions().getUsersByRole(MucOptions.Role.MODERATOR).isEmpty()) {
                                 final var u = new MucOptions.User(conversation.getMucOptions(), null, "\0role:moderator", "Notify active moderators", new HashSet<>());
@@ -1913,7 +1912,6 @@ public class ConversationFragment extends XmppFragment
                         @Override
                         protected void onViewHidden() {
                             if (getRecyclerView() == null) return;
-                            try { getRecyclerView().getItemAnimator().endAnimations(); } catch (final Exception e) { }
                             super.onViewHidden();
                         }
 
@@ -1922,6 +1920,7 @@ public class ConversationFragment extends XmppFragment
                             emojiDebounce.removeCallbacksAndMessages(null);
                             emojiDebounce.postDelayed(() -> {
                                 if (getRecyclerView() == null) return;
+                                getRecyclerView().setItemAnimator(null);
                                 adapter.search(activity, getRecyclerView(), query.toString());
                             }, 100L);
                         }
diff --git a/src/monocleschat/java/de/monocles/chat/EmojiSearch.java b/src/monocleschat/java/de/monocles/chat/EmojiSearch.java
index f95a3139f..9314a1c41 100644
--- a/src/monocleschat/java/de/monocles/chat/EmojiSearch.java
+++ b/src/monocleschat/java/de/monocles/chat/EmojiSearch.java
@@ -298,7 +298,6 @@ public class EmojiSearch {
 					// Acquire outside so to not block UI thread
 					doingUpdate.acquire();
 					activity.runOnUiThread(() -> {
-						try { view.getItemAnimator().endAnimations(); } catch (final Exception e) {  }
 						submitList(results, () -> {
 							activity.runOnUiThread(() -> doingUpdate.release());
 						});