diff --git a/android/res/values/donottranslate.xml b/android/res/values/donottranslate.xml
index 7d0d33c46c..e880679858 100644
--- a/android/res/values/donottranslate.xml
+++ b/android/res/values/donottranslate.xml
@@ -40,7 +40,6 @@
   <string name="pref_map_style" translatable="false">MapStyle</string>
   <string name="pref_tts_enabled" translatable="false">TtsEnabled</string>
   <string name="pref_tts_language" translatable="false">TtsLanguage</string>
-  <string name="pref_autodownload" translatable="false">AutoDownloadMap</string>
   <string name="pref_3d" translatable="false">3D</string>
   <string name="pref_3d_buildings" translatable="false">3DBuildings</string>
   <string name="pref_track_record" translatable="false">TrackRecord</string>
diff --git a/android/res/xml-v21/prefs_map.xml b/android/res/xml-v21/prefs_map.xml
index 3e0d2eb23d..7f28fdf9bf 100644
--- a/android/res/xml-v21/prefs_map.xml
+++ b/android/res/xml-v21/prefs_map.xml
@@ -30,30 +30,23 @@
     android:entryValues="@array/map_style_values"
     android:order="4"/>
 
-  <SwitchPreference
-    android:key="@string/pref_autodownload"
-    android:title="@string/autodownload"
-    android:switchTextOn=""
-    android:switchTextOff=""
-    android:order="5"/>
-
   <SwitchPreference
     android:key="@string/pref_3d_buildings"
     android:title="@string/pref_map_3d_buildings_title"
     android:switchTextOn=""
     android:switchTextOff=""
-    android:order="6"/>
+    android:order="5"/>
 
   <Preference
     android:key="@string/pref_yota"
     android:title="@string/yopme_pref_title"
     android:summary="@string/yopme_pref_summary"
-    android:order="7"/>
+    android:order="6"/>
 
   <ListPreference
     android:key="@string/pref_track_record"
     android:title="@string/pref_track_record_title"
     android:entries="@array/track_length"
     android:entryValues="@array/track_length_values"
-    android:order="8"/>
+    android:order="7"/>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/android/res/xml/prefs_map.xml b/android/res/xml/prefs_map.xml
index 8aa5a5cbad..74db851d52 100644
--- a/android/res/xml/prefs_map.xml
+++ b/android/res/xml/prefs_map.xml
@@ -28,26 +28,21 @@
     android:entryValues="@array/map_style_values"
     android:order="4"/>
 
-  <CheckBoxPreference
-    android:key="@string/pref_autodownload"
-    android:title="@string/autodownload"
-    android:order="5"/>
-
   <CheckBoxPreference
     android:key="@string/pref_3d_buildings"
     android:title="@string/pref_map_3d_buildings_title"
-    android:order="6"/>
+    android:order="5"/>
 
   <Preference
     android:key="@string/pref_yota"
     android:title="@string/yopme_pref_title"
     android:summary="@string/yopme_pref_summary"
-    android:order="7"/>
+    android:order="6"/>
 
   <ListPreference
     android:key="@string/pref_track_record"
     android:title="@string/pref_track_record_title"
     android:entries="@array/track_length"
     android:entryValues="@array/track_length_values"
-    android:order="8"/>
+    android:order="7"/>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/android/src/com/mapswithme/maps/downloader/OnmapDownloader.java b/android/src/com/mapswithme/maps/downloader/OnmapDownloader.java
index 9f1d623abe..cbe7a13ba1 100644
--- a/android/src/com/mapswithme/maps/downloader/OnmapDownloader.java
+++ b/android/src/com/mapswithme/maps/downloader/OnmapDownloader.java
@@ -15,7 +15,6 @@ import com.mapswithme.maps.background.Notifier;
 import com.mapswithme.maps.location.LocationHelper;
 import com.mapswithme.maps.routing.RoutingController;
 import com.mapswithme.maps.widget.WheelProgressView;
-import com.mapswithme.util.Config;
 import com.mapswithme.util.ConnectionState;
 import com.mapswithme.util.StringUtils;
 import com.mapswithme.util.UiUtils;
@@ -87,12 +86,12 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener
   public void updateState(boolean shouldAutoDownload)
   {
     boolean showFrame = (mCurrentCountry != null &&
+                         !mCurrentCountry.present &&
                          !RoutingController.get().isNavigating());
     if (showFrame)
     {
       boolean enqueued = (mCurrentCountry.status == CountryItem.STATUS_ENQUEUED);
-      boolean progress = (mCurrentCountry.status == CountryItem.STATUS_PROGRESS &&
-                          !mCurrentCountry.present);
+      boolean progress = (mCurrentCountry.status == CountryItem.STATUS_PROGRESS);
       boolean failed = (mCurrentCountry.status == CountryItem.STATUS_FAILED);
 
       showFrame = (enqueued || progress || failed ||
@@ -128,7 +127,6 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener
                 !sAutodownloadLocked &&
                 !failed &&
                 !MapManager.nativeIsLegacyMode() &&
-                Config.isAutodownloadMaps() &&
                 ConnectionState.isWifiConnected())
             {
               Location loc = LocationHelper.INSTANCE.getLastLocation();
diff --git a/android/src/com/mapswithme/maps/settings/MapPrefsFragment.java b/android/src/com/mapswithme/maps/settings/MapPrefsFragment.java
index 2e98f1e53d..bd4a31610a 100644
--- a/android/src/com/mapswithme/maps/settings/MapPrefsFragment.java
+++ b/android/src/com/mapswithme/maps/settings/MapPrefsFragment.java
@@ -136,18 +136,6 @@ public class MapPrefsFragment extends BaseXmlSettingsFragment
       }
     });
 
-    TwoStatePreference prefAutodownload = (TwoStatePreference)findPreference(getString(R.string.pref_autodownload));
-    prefAutodownload.setChecked(Config.isAutodownloadMaps());
-    prefAutodownload.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener()
-    {
-      @Override
-      public boolean onPreferenceChange(Preference preference, Object newValue)
-      {
-        Config.setAutodownloadMaps((Boolean)newValue);
-        return true;
-      }
-    });
-
     final Framework.Params3dMode _3d = new Framework.Params3dMode();
     Framework.nativeGet3dMode(_3d);
 
diff --git a/android/src/com/mapswithme/util/Config.java b/android/src/com/mapswithme/util/Config.java
index 2fc191ad19..6cef015db1 100644
--- a/android/src/com/mapswithme/util/Config.java
+++ b/android/src/com/mapswithme/util/Config.java
@@ -19,7 +19,6 @@ public final class Config
 
   private static final String KEY_PREF_ZOOM_BUTTONS = "ZoomButtonsEnabled";
   private static final String KEY_PREF_STATISTICS = "StatisticsEnabled";
-  private static final String KEY_PREF_AUTODOWNLOAD = "AutoDownloadEnabled";
 
   private static final String KEY_LIKES_RATED_DIALOG = "RatedDialog";
   private static final String KEY_LIKES_LAST_RATED_SESSION = "LastRatedSession";
@@ -311,16 +310,6 @@ public final class Config
     return true;
   }
 
-  public static boolean isAutodownloadMaps()
-  {
-    return getBool(KEY_PREF_AUTODOWNLOAD, true);
-  }
-
-  public static void setAutodownloadMaps(boolean set)
-  {
-    setBool(KEY_PREF_AUTODOWNLOAD, set);
-  }
-
   private static native boolean nativeGetBoolean(String name, boolean defaultValue);
   private static native void nativeSetBoolean(String name, boolean value);
   private static native int nativeGetInt(String name, int defaultValue);