diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index adb31217fc7535a46f2b861c1d09f75a3b626830..9933a7f3dbb6b33e44e3ea3114a87335f79e45a8 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -2864,6 +2864,9 @@ public class ConversationFragment extends XmppFragment
         if (commandAdapter == null) return;
 
         Jid commandJid = conversation.getContact().resourceWhichSupport(Namespace.COMMANDS);
+        if (commandJid == null && conversation.getJid().isDomainJid()) {
+            commandJid = conversation.getJid();
+        }
         if (commandJid == null) {
             conversation.hideViewPager();
         } else {