diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index c2ab957fbc19977dbf0c4de021cd8dd341c5d72e..28a59624f6642ed85fc8d0c9699b34ed8491e840 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -387,7 +387,7 @@ public class ConversationFragment extends XmppFragment
                                                                     .populateWithMessages(
                                                                             ConversationFragment
                                                                                     .this
-                                                                                    .messageList, activity.xmppConnectionService);
+                                                                                    .messageList, activity == null ? null : activity.xmppConnectionService);
                                                             try {
                                                                 updateStatusMessages();
                                                             } catch (IllegalStateException e) {