diff --git a/map/routing_manager.cpp b/map/routing_manager.cpp
index cce1a499d5..6cc88d991f 100644
--- a/map/routing_manager.cpp
+++ b/map/routing_manager.cpp
@@ -1154,7 +1154,10 @@ void RoutingManager::MatchLocationToRoute(location::GpsInfo & location,
   if (!IsRoutingActive())
     return;
 
-  m_routingSession.MatchLocationToRoute(location, routeMatchingInfo);
+  bool const matchedToRoute = m_routingSession.MatchLocationToRoute(location, routeMatchingInfo);
+
+  if (!matchedToRoute && m_currentRouterType == RouterType::Vehicle)
+    m_routingSession.MatchLocationToRoadGraph(location);
 }
 
 location::RouteMatchingInfo RoutingManager::GetRouteMatchingInfo(location::GpsInfo & info)
diff --git a/map/routing_manager.hpp b/map/routing_manager.hpp
index c489b4e8b4..94268abd17 100644
--- a/map/routing_manager.hpp
+++ b/map/routing_manager.hpp
@@ -337,6 +337,8 @@ private:
 
   bool IsTrackingReporterEnabled() const;
   bool IsTrackingReporterArchiveEnabled() const;
+  /// \returns false if the location could not be matched to the route and should be matched to the
+  /// road graph. Otherwise returns true.
   void MatchLocationToRoute(location::GpsInfo & info,
                             location::RouteMatchingInfo & routeMatchingInfo);
   location::RouteMatchingInfo GetRouteMatchingInfo(location::GpsInfo & info);
diff --git a/routing/index_router.cpp b/routing/index_router.cpp
index 9e09bc92a5..1331ee57be 100644
--- a/routing/index_router.cpp
+++ b/routing/index_router.cpp
@@ -336,7 +336,7 @@ bool IndexRouter::FindClosestProjectionToRoad(m2::PointD const & point,
   auto const rect = mercator::RectByCenterXYAndSizeInMeters(point, radius);
   std::vector<std::pair<Edge, geometry::PointWithAltitude>> candidates;
 
-  uint32_t const count = direction.IsAlmostZero() ? 1 : 3;
+  uint32_t const count = direction.IsAlmostZero() ? 1 : 4;
   m_roadGraph.FindClosestEdges(rect, count, candidates);
 
   if (candidates.empty())
diff --git a/routing/routing_session.cpp b/routing/routing_session.cpp
index 66980dcecb..2a70797f0f 100644
--- a/routing/routing_session.cpp
+++ b/routing/routing_session.cpp
@@ -550,24 +550,20 @@ void RoutingSession::MatchLocationToRoadGraph(location::GpsInfo & location)
   m_proj = proj;
 }
 
-void RoutingSession::MatchLocationToRoute(location::GpsInfo & location,
+bool RoutingSession::MatchLocationToRoute(location::GpsInfo & location,
                                           location::RouteMatchingInfo & routeMatchingInfo)
 {
   CHECK_THREAD_CHECKER(m_threadChecker, ());
   if (!IsOnRoute())
-    return;
+    return true;
 
   ASSERT(m_route, ());
 
   bool const matchedToRoute = m_route->MatchLocationToRoute(location, routeMatchingInfo);
   if (matchedToRoute)
-  {
     m_projectedToRoadGraph = false;
-    return;
-  }
 
-  // Could not match location to the route. Let's try to match to the road graph.
-  MatchLocationToRoadGraph(location);
+  return matchedToRoute;
 }
 
 traffic::SpeedGroup RoutingSession::MatchTraffic(
diff --git a/routing/routing_session.hpp b/routing/routing_session.hpp
index beae15dad6..48eadb61a9 100644
--- a/routing/routing_session.hpp
+++ b/routing/routing_session.hpp
@@ -99,7 +99,7 @@ public:
   SessionState OnLocationPositionChanged(location::GpsInfo const & info);
   void GetRouteFollowingInfo(FollowingInfo & info) const;
 
-  void MatchLocationToRoute(location::GpsInfo & location,
+  bool MatchLocationToRoute(location::GpsInfo & location,
                             location::RouteMatchingInfo & routeMatchingInfo);
   void MatchLocationToRoadGraph(location::GpsInfo & location);
   // Get traffic speed for the current route position.