diff --git a/git/release/output-metadata.json b/git/release/output-metadata.json
index 95c86e1cb..b070cd6f8 100644
--- a/git/release/output-metadata.json
+++ b/git/release/output-metadata.json
@@ -20,13 +20,13 @@
       "filters": [
         {
           "filterType": "ABI",
-          "value": "x86_64"
+          "value": "x86"
         }
       ],
       "attributes": [],
-      "versionCode": 15003,
+      "versionCode": 15002,
       "versionName": "1.7.7.5",
-      "outputFile": "monocles chat-1.7.7.5-git-x86_64-release.apk"
+      "outputFile": "monocles chat-1.7.7.5-git-x86-release.apk"
     },
     {
       "type": "ONE_OF_MANY",
@@ -41,19 +41,6 @@
       "versionName": "1.7.7.5",
       "outputFile": "monocles chat-1.7.7.5-git-arm64-v8a-release.apk"
     },
-    {
-      "type": "ONE_OF_MANY",
-      "filters": [
-        {
-          "filterType": "ABI",
-          "value": "x86"
-        }
-      ],
-      "attributes": [],
-      "versionCode": 15002,
-      "versionName": "1.7.7.5",
-      "outputFile": "monocles chat-1.7.7.5-git-x86-release.apk"
-    },
     {
       "type": "ONE_OF_MANY",
       "filters": [
@@ -66,6 +53,19 @@
       "versionCode": 15001,
       "versionName": "1.7.7.5",
       "outputFile": "monocles chat-1.7.7.5-git-armeabi-v7a-release.apk"
+    },
+    {
+      "type": "ONE_OF_MANY",
+      "filters": [
+        {
+          "filterType": "ABI",
+          "value": "x86_64"
+        }
+      ],
+      "attributes": [],
+      "versionCode": 15003,
+      "versionName": "1.7.7.5",
+      "outputFile": "monocles chat-1.7.7.5-git-x86_64-release.apk"
     }
   ],
   "elementType": "File"
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 62e791485..5b298c731 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -3559,11 +3559,18 @@ if (activity!=null  && activity.xmppConnectionService.getBooleanPreference("show
         refreshCommands(false);
     }
 } else {
-        binding.commandsViewProgressbar.setVisibility(GONE);
+    if (commandAdapter != null && conversation != originalConversation) {
+        commandAdapter = null;
+        conversation.setupViewPager(binding.conversationViewPager, binding.tabLayout, false, originalConversation);
+        refreshCommands(false);
+    }
+    if (commandAdapter == null && conversation != null) {
+        commandAdapter = null;
         conversation.setupViewPager(binding.conversationViewPager, binding.tabLayout, false, null);
         binding.commandsView.setAdapter(null);
         refreshCommands(false);
-}
+    }
+        }
         return true;
     }