diff --git a/map/routing_manager.cpp b/map/routing_manager.cpp
index 9fb4054324..e962e2543e 100644
--- a/map/routing_manager.cpp
+++ b/map/routing_manager.cpp
@@ -407,15 +407,14 @@ void RoutingManager::SetRouterImpl(RouterType type)
 
 void RoutingManager::RemoveRoute(bool deactivateFollowing)
 {
-  GetPlatform().RunTask(Platform::Thread::Gui, [this]()
+  GetPlatform().RunTask(Platform::Thread::Gui, [this, deactivateFollowing]()
   {
     m_bmManager->GetEditSession().ClearGroup(UserMark::Type::TRANSIT);
+
+    if (deactivateFollowing)
+      SetPointsFollowingMode(false /* enabled */);
   });
 
-
-  if (deactivateFollowing)
-    SetPointsFollowingMode(false /* enabled */);
-
   if (deactivateFollowing)
   {
     // Remove all subroutes.