diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 9498a1db64761b31d14383081f982ac920a9e4e7..3ebe872fb02e853210be238147b8ea34ac78d434 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -3573,6 +3573,12 @@ public class ConversationFragment extends XmppFragment
         if (commandJid == null && conversation.getJid().isDomainJid()) {
             commandJid = conversation.getJid();
         }
+        if (commandJid == null) {
+            final var domainJid = conversation.getJid().getDomain();
+            if (domainJid != null) {
+                commandJid = domainJid;
+            }
+        }
         if (commandJid == null) {
             binding.commandsViewProgressbar.setVisibility(View.GONE);
             if (mucConfig == null) {