diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 40c12cd8c7ac91a02683e760739e26eba23e1df9..7615f82d002c275aadf2a9a0bbb86df249f3207d 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -3584,7 +3584,7 @@ public class ConversationFragment extends XmppFragment
                 if (messageListAdapter.hasSelection()) {
                     if (notifyConversationRead) binding.messagesView.postDelayed(this::refresh, 1000L);
                 } else {
-                    conversation.populateWithMessages(this.messageList, activity.xmppConnectionService);
+                    conversation.populateWithMessages(this.messageList, activity == null ? null : activity.xmppConnectionService);
                     updateStatusMessages();
                     this.messageListAdapter.notifyDataSetChanged();
                 }