diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 20154253cff56094c2964ad003d856390576e2ce..c3b4272260aaf1aec8f0a1a3a99e0255ee4c1941 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -1689,6 +1689,7 @@ public class ConversationFragment extends XmppFragment
         messageListAdapter.setOnMessageBoxClicked(null);
         messageListAdapter.setOnMessageBoxSwiped(null);
         binding.conversationViewPager.setAdapter(null);
+        binding.messagesView.setOnScrollListener(null);
         unregisterForContextMenu(binding.messagesView);
         unregisterForContextMenu(binding.textSendButton);
         if (conversation != null) conversation.setupViewPager(null, null, false, null);