diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 9480f3c1c8a84b61b1c1270b3ab1e6c8a388bce2..9498a1db64761b31d14383081f982ac920a9e4e7 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -3615,6 +3615,21 @@ public class ConversationFragment extends XmppFragment
                         @Override
                         public void onFailure(@NonNull Throwable throwable) {
                             Log.d(Config.LOGTAG, "Failed to get commands: " + throwable);
+
+                            if (activity == null) return;
+
+                            activity.runOnUiThread(() -> {
+                                binding.commandsViewProgressbar.setVisibility(View.GONE);
+                                commandAdapter.clear();
+
+                                if (mucConfig != null) commandAdapter.add(mucConfig);
+
+                                if (commandAdapter.getCount() < 1) {
+                                    conversation.hideViewPager();
+                                } else if (delayShow) {
+                                    conversation.showViewPager();
+                                }
+                            });
                         }
                     },
                     MoreExecutors.directExecutor()