diff --git a/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java b/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java
index 9e9d791120..6647a8e08e 100644
--- a/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java
+++ b/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java
@@ -221,7 +221,7 @@ public class BaseDownloadActivity extends SherlockFragmentActivity {
 	private void prepareDownloadDirectory() {
 		if (getMyApplication().getResourceManager().getIndexFileNames().isEmpty()) {
 			boolean showedDialog = false;
-			if (Build.VERSION.SDK_INT < OsmandSettings.VERSION_DEFAULTLOCATION_CHANGED) {
+			if ((Build.VERSION.SDK_INT < OsmandSettings.VERSION_DEFAULTLOCATION_CHANGED) && settings.getExternalStorageDirectory().getAbsolutePath().isEmpty()) {
 				SuggestExternalDirectoryDialog.showDialog(this, null, null);
 			}
 			if (!showedDialog) {