diff --git a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
index 5134a58b6..ceeebb304 100644
--- a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
+++ b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
@@ -53,4 +53,9 @@ object FeatureFlags {
      * Disables FxA Application Services Pairing feature
      */
     const val asFeatureFxAPairingDisabled = false
+
+    /**
+     * Enables the new language picker
+     */
+    val fenixLanguagePicker = Config.channel.isNightlyOrDebug
 }
diff --git a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
index 50359f907..81317ef34 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
@@ -185,6 +185,10 @@ class SettingsFragment : PreferenceFragmentCompat() {
         findPreference<Preference>(getPreferenceKey(pref_key_passwords))?.apply {
             isVisible = FeatureFlags.logins
         }
+
+        findPreference<PreferenceCategory>(getPreferenceKey(R.string.pref_key_advanced))?.apply {
+            isVisible = FeatureFlags.fenixLanguagePicker
+        }
     }
 
     @Suppress("ComplexMethod", "LongMethod")
diff --git a/app/src/main/res/values/preference_keys.xml b/app/src/main/res/values/preference_keys.xml
index 4c83e4e30..f4f73d9b1 100644
--- a/app/src/main/res/values/preference_keys.xml
+++ b/app/src/main/res/values/preference_keys.xml
@@ -14,6 +14,7 @@
     <string name="pref_key_accessibility_auto_size" translatable="false">pref_key_accessibility_auto_size</string>
     <string name="pref_key_accessibility_font_scale" translatable="false">pref_key_accessibility_font_scale</string>
     <string name="pref_key_accessibility_force_enable_zoom" translatable="false">pref_key_accessibility_force_enable_zoom</string>
+    <string name="pref_key_advanced" translatable="false">pref_key_advanced</string>
     <string name="pref_key_language" translatable="false">pref_key_language</string>
     <string name="pref_key_data_choices" translatable="false">pref_key_data_choices</string>
     <string name="pref_key_privacy_link" translatable="false">pref_key_privacy_link</string>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index fc69c266a..349243d95 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -103,7 +103,9 @@
 
     <PreferenceCategory
         android:title="@string/preferences_category_advanced"
-        app:iconSpaceReserved="false">
+        app:iconSpaceReserved="false"
+        android:key="@string/pref_key_advanced"
+        app:isPreferenceVisible="false">
         <androidx.preference.Preference
             android:icon="@drawable/ic_language"
             android:key="@string/pref_key_language"