diff --git a/src/cheogram/java/com/cheogram/android/EmojiSearch.java b/src/cheogram/java/com/cheogram/android/EmojiSearch.java
index 03b90627ec3e64b77dd5e76beb9a08a033cb550c..e8ee6cdfb0e84a94fc63c8d94c2b63662301b19e 100644
--- a/src/cheogram/java/com/cheogram/android/EmojiSearch.java
+++ b/src/cheogram/java/com/cheogram/android/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());
 						});
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 0ec88c1b607af4634ddea035513c7f6de4c172c8..5e77324b5e1b08ffec21aec5f01eab85ec346082 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -1539,7 +1539,6 @@ public class ConversationFragment extends XmppFragment
                 protected void onQuery(@Nullable CharSequence query) {
                     if (!activity.xmppConnectionService.getBooleanPreference("message_autocomplete", R.bool.message_autocomplete)) return;
 
-                    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<>());
@@ -1632,7 +1631,6 @@ public class ConversationFragment extends XmppFragment
                 @Override
                 protected void onViewHidden() {
                     if (getRecyclerView() == null) return;
-                    try { getRecyclerView().getItemAnimator().endAnimations(); } catch (final Exception e) { }
                     super.onViewHidden();
                 }
 
@@ -1643,6 +1641,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);
                 }