diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm
index e03915ab2a..278c96ee83 100644
--- a/iphone/Maps/Classes/MapsAppDelegate.mm
+++ b/iphone/Maps/Classes/MapsAppDelegate.mm
@@ -126,6 +126,12 @@ using namespace osm_auth_ios;
   
   [[DeepLinkHandler shared] applicationDidFinishLaunching:launchOptions];
   // application:openUrl:options is called later for deep links if YES is returned.
+  
+  dispatch_async(dispatch_get_main_queue(), ^{
+    [self handleNavigationForAppStartup];
+    [self moveToDushanbeIfNotInTjk];
+  });
+  
   return YES;
 }
 
@@ -211,11 +217,6 @@ using namespace osm_auth_ios;
   LOG(LINFO, ("applicationDidBecomeActive - begin"));
   auto & f = GetFramework();
   
-  [self handleNavigationForAppStartup];
-  
-  [self moveToDushanbeIfNotInTjk];
-  
-  
   f.EnterForeground();
   [self.mapViewController onGetFocus:YES];
   f.SetRenderingEnabled();