diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm
index 96bb7bcdb..2269196c8 100644
--- a/platform/ios/src/MGLMapView.mm
+++ b/platform/ios/src/MGLMapView.mm
@@ -3175,7 +3175,9 @@ std::chrono::steady_clock::duration MGLDurationInSeconds(float duration)
             [self resetNorthAnimated:NO];
         }
     }
-    else if (self.direction < snapTolerance || self.direction > 360 - snapTolerance)
+    else if ((self.direction < snapTolerance || self.direction > 360 - snapTolerance)
+             && self.userTrackingMode != MGLUserTrackingModeFollowWithHeading
+             && self.userTrackingMode != MGLUserTrackingModeFollowWithCourse)
     {
         [self resetNorthAnimated:animated];
     }