diff --git a/vector/src/main/res/values/config.xml b/vector/src/main/res/values/config.xml
index b419477c1f..b18a0a0d4f 100755
--- a/vector/src/main/res/values/config.xml
+++ b/vector/src/main/res/values/config.xml
@@ -42,7 +42,9 @@
 
     <!-- Default preference values -->
 
-    <!-- If set to true, bubbles will be enabled by default in the preference -->
+    <!-- If set to true, bubbles setting will be visible to the user in the preference -->
+    <bool name="settings_interface_bubble_visible">true</bool>
+    <!-- If set to true, bubbles will be enabled by default -->
     <bool name="settings_interface_bubble_default">false</bool>
 
 </resources>
diff --git a/vector/src/main/res/xml/vector_settings_preferences.xml b/vector/src/main/res/xml/vector_settings_preferences.xml
index b782a60749..78bd64111c 100644
--- a/vector/src/main/res/xml/vector_settings_preferences.xml
+++ b/vector/src/main/res/xml/vector_settings_preferences.xml
@@ -85,7 +85,8 @@
         <im.vector.app.core.preference.VectorSwitchPreference
             android:defaultValue="@bool/settings_interface_bubble_default"
             android:key="SETTINGS_INTERFACE_BUBBLE_KEY"
-            android:title="@string/message_bubbles" />
+            android:title="@string/message_bubbles"
+            app:isPreferenceVisible="@bool/settings_interface_bubble_visible" />
 
         <im.vector.app.core.preference.VectorSwitchPreference
             android:defaultValue="true"