diff --git a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
index 3d89315ac6..9021c339c1 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
@@ -498,8 +498,8 @@ public class MapControlsLayer extends OsmandMapLayer {
 				routingHelper.setFollowingMode(true);
 				routingHelper.setRoutePlanningMode(false);
 				mapActivity.getMapViewTrackingUtilities().switchToRoutePlanningMode();
-				routingHelper.setCurrentLocation(app.getLocationProvider().getLastKnownLocation(), false);
 				app.getRoutingHelper().notifyIfRouteIsCalculated();
+				routingHelper.setCurrentLocation(app.getLocationProvider().getLastKnownLocation(), false);
 			}
 		}
 	}