diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 7eb5e9fe9129efc1afea0b86300be02bbf437719..b79cdf8dbb74b86661b96d4444828d20f807c41b 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -3398,7 +3398,7 @@ public class ConversationFragment extends XmppFragment
                     final Jid discoJid = conversation.getContact().resourceWhichSupport(Namespace.COMMANDS);
                     if (discoJid != null) commandJid = discoJid;
                 }
-                if (node != null && commandJid != null) {
+                if (node != null && commandJid != null && activity != null) {
                     conversation.startCommand(commandFor(commandJid, node), activity.xmppConnectionService);
                 }
             });