diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 4be4c0877bc40c6ec37399f0dae21d0e1f4853a0..905ebffbec7321b7e5164ad12f344f44bbb1efcb 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -3085,6 +3085,9 @@ public class ConversationFragment extends XmppFragment
         if (commandAdapter == null) return;
 
         Jid commandJid = conversation.getContact().resourceWhichSupport(Namespace.COMMANDS);
+        if (commandJid == null && conversation.getMode() == Conversation.MODE_MULTI && conversation.getMucOptions().hasFeature(Namespace.COMMANDS)) {
+            commandJid = conversation.getJid().asBareJid();
+        }
         if (commandJid == null && conversation.getJid().isDomainJid()) {
             commandJid = conversation.getJid();
         }