diff --git a/ios/MBXViewController.mm b/ios/MBXViewController.mm
index f74857a08..76649cdfc 100644
--- a/ios/MBXViewController.mm
+++ b/ios/MBXViewController.mm
@@ -42,6 +42,8 @@ llmr::Settings_NSUserDefaults *settings = nullptr;
     self.mapView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
     [self.view addSubview:self.mapView];
 
+    self.mapView.viewControllerForLayoutGuides = self;
+
     settings = new llmr::Settings_NSUserDefaults();
     [self restoreState:nil];
 
diff --git a/ios/mapbox-gl-cocoa b/ios/mapbox-gl-cocoa
index 1e008ce7d..31b708821 160000
--- a/ios/mapbox-gl-cocoa
+++ b/ios/mapbox-gl-cocoa
@@ -1 +1 @@
-Subproject commit 1e008ce7dce7f762b3c74825381a376b1aa03b9f
+Subproject commit 31b708821de6e8a539ff3a2353202850c253da94