diff --git a/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java b/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java
index 72c07ec630..5286c26d17 100644
--- a/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java
+++ b/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java
@@ -231,6 +231,8 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment implements La
 
     if (!SharedPropertiesUtils.shouldShowEmulateBadStorageSetting(requireContext()))
       removePreference(getString(R.string.pref_settings_general), pref);
+    else
+      pref.setVisible(true);
   }
 
   private void initAutoZoomPrefsCallbacks()
diff --git a/android/app/src/main/res/xml/prefs_main.xml b/android/app/src/main/res/xml/prefs_main.xml
index e162e025d6..3ce113a9fa 100644
--- a/android/app/src/main/res/xml/prefs_main.xml
+++ b/android/app/src/main/res/xml/prefs_main.xml
@@ -68,6 +68,7 @@
       android:title="@string/setting_emulate_bad_storage"
       app:singleLineTitle="false"
       android:defaultValue="false"
+      app:isPreferenceVisible="false"
       android:order="13"/>
     <ListPreference
       android:key="@string/pref_use_mobile_data"
diff --git a/android/app/src/main/res/xml/prefs_voice_instructions.xml b/android/app/src/main/res/xml/prefs_voice_instructions.xml
index c9ff2edd19..66862510be 100644
--- a/android/app/src/main/res/xml/prefs_voice_instructions.xml
+++ b/android/app/src/main/res/xml/prefs_voice_instructions.xml
@@ -9,16 +9,20 @@
   <SwitchPreferenceCompat
       android:key="@string/pref_tts_street_names"
       android:title="@string/pref_tts_street_names_title"
+      app:isPreferenceVisible="false"
       android:summary="@string/pref_tts_street_names_description"
       android:defaultValue="false" />
   <ListPreference
       android:key="@string/pref_tts_language"
+      app:isPreferenceVisible="false"
       android:title="@string/pref_tts_language_title" />
   <SeekBarPreference
       android:key="@string/pref_tts_volume"
+      app:isPreferenceVisible="false"
       android:title="@string/volume" />
   <Preference
       android:key="@string/pref_tts_test_voice"
+      app:isPreferenceVisible="false"
       android:title="@string/pref_tts_test_voice_title" />
   <Preference
       android:key="@string/pref_tts_open_system_settings"