diff --git a/iphone/Maps/Core/DeepLink/DeepLinkHandler.swift b/iphone/Maps/Core/DeepLink/DeepLinkHandler.swift
index f15b179324..307f5f6676 100644
--- a/iphone/Maps/Core/DeepLink/DeepLinkHandler.swift
+++ b/iphone/Maps/Core/DeepLink/DeepLinkHandler.swift
@@ -9,12 +9,6 @@
   }
 
   func applicationDidFinishLaunching(_ options: [UIApplication.LaunchOptionsKey : Any]? = nil) {
-    if let userActivityOptions = options?[.userActivityDictionary] as? [UIApplication.LaunchOptionsKey : Any],
-      let userActivityType = userActivityOptions[.userActivityType] as? String,
-      userActivityType == NSUserActivityTypeBrowsingWeb {
-      isLaunchedByDeeplink = true
-    }
-
     if let launchDeeplink = options?[UIApplication.LaunchOptionsKey.url] as? URL {
       isLaunchedByDeeplink = true
       url = launchDeeplink
diff --git a/map/framework.cpp b/map/framework.cpp
index cfc0550cfd..6ed0fd4cb5 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -2135,9 +2135,6 @@ std::optional<place_page::Info> Framework::BuildPlacePageInfo(
     place_page::BuildInfo const & buildInfo)
 {
   place_page::Info outInfo;
-  if (m_drapeEngine == nullptr)
-    return {};
-
   outInfo.SetBuildInfo(buildInfo);
 
   if (buildInfo.IsUserMarkMatchingEnabled())
@@ -2212,7 +2209,8 @@ std::optional<place_page::Info> Framework::BuildPlacePageInfo(
   FeatureID selectedFeature = buildInfo.m_featureId;
   auto const isFeatureMatchingEnabled = buildInfo.IsFeatureMatchingEnabled();
 
-  if (buildInfo.IsTrackMatchingEnabled() && !buildInfo.m_isLongTap &&
+  // Using VisualParams inside FindTrackInTapPosition/GetDefaultTapRect requires drapeEngine.
+  if (m_drapeEngine != nullptr && buildInfo.IsTrackMatchingEnabled() && !buildInfo.m_isLongTap &&
       !(isFeatureMatchingEnabled && selectedFeature.IsValid()))
   {
     auto const trackSelectionInfo = FindTrackInTapPosition(buildInfo);