diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 2807f0dd6248def3ffbfd8d6e511762e4e088471..58db69c9be7e2fc59d5587b4d681537a3cd38dca 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -1578,7 +1578,10 @@ public class ConversationFragment extends XmppFragment
             if (!entry.getKey().equals("")) jid = jid.withResource(entry.getKey());
             activity.xmppConnectionService.fetchCaps(conversation.getAccount(), jid, entry.getValue(), () -> {
                 if (activity == null) return;
-                activity.runOnUiThread(() -> { refresh(); });
+                activity.runOnUiThread(() -> {
+                    refresh();
+                    refreshCommands();
+                });
             });
         }
     }
@@ -2868,7 +2871,6 @@ public class ConversationFragment extends XmppFragment
                 }
                 updateSendButton();
                 updateEditablity();
-                refreshCommands();
             }
         }
     }