diff --git a/vector-config/src/main/res/values/config-settings.xml b/vector-config/src/main/res/values/config-settings.xml
index ced678fb98..7b7aac8156 100755
--- a/vector-config/src/main/res/values/config-settings.xml
+++ b/vector-config/src/main/res/values/config-settings.xml
@@ -42,7 +42,9 @@
     <bool name="settings_labs_thread_messages_default">false</bool>
     <bool name="settings_labs_new_app_layout_default">true</bool>
     <bool name="settings_labs_new_session_manager_default">false</bool>
+    <bool name="settings_labs_new_session_manager_visible">true</bool>
     <bool name="settings_labs_client_info_recording_default">false</bool>
+    <bool name="settings_labs_client_info_recording_visible">true</bool>
     <bool name="settings_timeline_show_live_sender_info_visible">true</bool>
     <bool name="settings_timeline_show_live_sender_info_default">false</bool>
     <bool name="settings_labs_rich_text_editor_visible">true</bool>
diff --git a/vector/src/main/res/xml/vector_settings_labs.xml b/vector/src/main/res/xml/vector_settings_labs.xml
index ea4d39aa47..5b519bdd91 100644
--- a/vector/src/main/res/xml/vector_settings_labs.xml
+++ b/vector/src/main/res/xml/vector_settings_labs.xml
@@ -107,12 +107,14 @@
         android:defaultValue="@bool/settings_labs_new_session_manager_default"
         android:key="SETTINGS_LABS_NEW_SESSION_MANAGER_KEY"
         android:summary="@string/labs_enable_session_manager_summary"
-        android:title="@string/labs_enable_session_manager_title" />
+        android:title="@string/labs_enable_session_manager_title"
+        app:isPreferenceVisible="@bool/settings_labs_new_session_manager_visible" />
 
     <im.vector.app.core.preference.VectorSwitchPreference
         android:defaultValue="@bool/settings_labs_client_info_recording_default"
         android:key="SETTINGS_LABS_CLIENT_INFO_RECORDING_KEY"
         android:summary="@string/labs_enable_client_info_recording_summary"
-        android:title="@string/labs_enable_client_info_recording_title" />
+        android:title="@string/labs_enable_client_info_recording_title"
+        app:isPreferenceVisible="@bool/settings_labs_client_info_recording_visible" />
 
 </androidx.preference.PreferenceScreen>