diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index d3458e3121..b8400a2be1 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -1712,15 +1712,11 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
     }
 
     public int getCurrentTab() {
-        if (xmppConnectionService != null && xmppConnectionService.getBooleanPreference("jump_to_commands_tab", R.bool.jump_to_commands_tab)) {
-            if (mCurrentTab >= 0) return mCurrentTab;
-
+        if (mCurrentTab >= 0) return mCurrentTab;
         if (!isRead(null) || getContact().resourceWhichSupport(Namespace.COMMANDS) == null) {
             return 0;
         }
-
-            return 1;
-        } else return 0;
+        return 1;
     }
 
     public void refreshSessions() {
diff --git a/src/main/res/xml/preferences_interface.xml b/src/main/res/xml/preferences_interface.xml
index 93cd892940..8c38021a9c 100644
--- a/src/main/res/xml/preferences_interface.xml
+++ b/src/main/res/xml/preferences_interface.xml
@@ -198,12 +198,14 @@
             android:key="follow_thread_in_channel"
             android:summary="@string/pref_follow_thread_in_channel_summary"
             android:title="@string/pref_follow_thread_in_channel" />
+        <!--
         <SwitchPreferenceCompat
             android:defaultValue="@bool/jump_to_commands_tab"
             android:icon="@drawable/ic_open_with_24dp"
             android:key="jump_to_commands_tab"
             android:summary="@string/pref_jump_to_commands_tab_summary"
             android:title="@string/pref_jump_to_commands_tab" />
+        -->
         <SwitchPreferenceCompat
             android:icon="@drawable/ic_mood_24dp"
             android:defaultValue="@bool/message_autocomplete"