diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm
index a6f319e4ac..a865f02329 100644
--- a/iphone/Maps/Classes/MapsAppDelegate.mm
+++ b/iphone/Maps/Classes/MapsAppDelegate.mm
@@ -552,9 +552,8 @@ using namespace osm_auth_ios;
 }
 
 - (BOOL)application:(UIApplication *)application
-    continueUserActivity:(NSUserActivity *)userActivity
-      restorationHandler:(void (^)(NSArray * restorableObjects))restorationHandler
-{
+continueUserActivity:(NSUserActivity *)userActivity
+ restorationHandler:(void (^)(NSArray<id<UIUserActivityRestoring>> * _Nullable))restorationHandler {
   if ([userActivity.activityType isEqualToString:CSSearchableItemActionType])
   {
     NSString * searchStringKey = userActivity.userInfo[CSSearchableItemActivityIdentifier];
@@ -749,7 +748,8 @@ didReceiveNotificationResponse:(UNNotificationResponse *)response
 {
   m_sourceApplication = options[UIApplicationOpenURLOptionsSourceApplicationKey];
 
-  if ([self checkLaunchURL:url])
+  if ([self checkLaunchURL:[url.host rangeOfString:@"dlink.maps.me"].location != NSNotFound
+       ? [self convertUniversalLink:url] : url])
   {
     [self handleURLs];
     return YES;
diff --git a/iphone/Maps/maps.me dbg.entitlements b/iphone/Maps/maps.me dbg.entitlements
index c09f085310..89321335e7 100644
--- a/iphone/Maps/maps.me dbg.entitlements	
+++ b/iphone/Maps/maps.me dbg.entitlements	
@@ -6,7 +6,6 @@
 	<string>development</string>
 	<key>com.apple.developer.associated-domains</key>
 	<array>
-		<string>applinks:mapsme.onelink.me</string>
 		<string>applinks:dlink.maps.me</string>
 	</array>
 </dict>