diff --git a/android/src/com/mapswithme/maps/DownloadResourcesLegacyActivity.java b/android/src/com/mapswithme/maps/DownloadResourcesLegacyActivity.java
index d014cd80ef..62e28df4aa 100644
--- a/android/src/com/mapswithme/maps/DownloadResourcesLegacyActivity.java
+++ b/android/src/com/mapswithme/maps/DownloadResourcesLegacyActivity.java
@@ -492,13 +492,15 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
     if (intent == null)
       return null;
 
-    MwmApplication application = (MwmApplication) getApplicationContext();
-    String firstLaunchDeeplink = application.getMediator().retrieveFirstLaunchDeeplink();
-    if (!TextUtils.isEmpty(firstLaunchDeeplink))
+    MwmApplication application = MwmApplication.from(this);
+    intent.putExtra(Factory.EXTRA_IS_FIRST_LAUNCH, application.isFirstLaunch());
+    if (intent.getData() == null)
     {
-      intent.setData(Uri.parse(firstLaunchDeeplink));
-      intent.putExtra(Factory.EXTRA_IS_FIRST_LAUNCH_DEEPLINK, true);
+      String firstLaunchDeeplink = application.getMediator().retrieveFirstLaunchDeeplink();
+      if (!TextUtils.isEmpty(firstLaunchDeeplink))
+        intent.setData(Uri.parse(firstLaunchDeeplink));
     }
+
     MapTask mapTaskToForward;
     for (IntentProcessor ip : mIntentProcessors)
     {
diff --git a/android/src/com/mapswithme/maps/intent/Factory.java b/android/src/com/mapswithme/maps/intent/Factory.java
index a8f74e3b75..cb73163018 100644
--- a/android/src/com/mapswithme/maps/intent/Factory.java
+++ b/android/src/com/mapswithme/maps/intent/Factory.java
@@ -51,7 +51,7 @@ import java.util.Locale;
 
 public class Factory
 {
-  public static final String EXTRA_IS_FIRST_LAUNCH_DEEPLINK = "extra_is_first_launch_deeplink";
+  public static final String EXTRA_IS_FIRST_LAUNCH = "extra_is_first_launch";
   @NonNull
   public static IntentProcessor createBuildRouteProcessor()
   {
@@ -150,7 +150,7 @@ public class Factory
     @Override
     public final MapTask process(@NonNull Intent intent)
     {
-      mFirstLaunch = intent.getBooleanExtra(Factory.EXTRA_IS_FIRST_LAUNCH_DEEPLINK, false);
+      mFirstLaunch = intent.getBooleanExtra(Factory.EXTRA_IS_FIRST_LAUNCH, false);
       Uri data = intent.getData();
       if (data == null)
         throw new AssertionError("Data must be non-null!");