diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 7af4797f4..d5f533ea5 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -3762,7 +3762,7 @@ public class ConversationFragment extends XmppFragment
 
     @Override
     public void refreshForNewCaps(final Set<Jid> newCapsJids) {
-        if (newCapsJids.isEmpty() || newCapsJids.contains(conversation.getJid().asBareJid())) {
+        if (newCapsJids.isEmpty() || (conversation != null && newCapsJids.contains(conversation.getJid().asBareJid()))) {
             refreshCommands(true);
         }
     }