diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp
index 2b98b70ebf..8ac1cfa7a3 100644
--- a/android/jni/com/mapswithme/maps/Framework.cpp
+++ b/android/jni/com/mapswithme/maps/Framework.cpp
@@ -1181,6 +1181,12 @@ Java_com_mapswithme_maps_Framework_nativeRemoveRoutePoint(JNIEnv * env, jclass,
                                               static_cast<int8_t>(intermediateIndex));
 }
 
+JNIEXPORT void JNICALL
+Java_com_mapswithme_maps_Framework_nativeRemoveIntermediateRoutePoints(JNIEnv * env, jclass)
+{
+  frm()->GetRoutingManager().RemoveIntermediateRoutePoints();
+}
+
 JNIEXPORT jboolean JNICALL
 Java_com_mapswithme_maps_Framework_nativeCouldAddIntermediatePoint(JNIEnv * env, jclass)
 {
diff --git a/android/src/com/mapswithme/maps/Framework.java b/android/src/com/mapswithme/maps/Framework.java
index 7aff6cc411..06ddd1cf1e 100644
--- a/android/src/com/mapswithme/maps/Framework.java
+++ b/android/src/com/mapswithme/maps/Framework.java
@@ -278,8 +278,12 @@ public class Framework
                                                 @RoutePointInfo.RouteMarkType int markType,
                                                 int intermediateIndex, boolean isMyPosition,
                                                 double lat, double lon);
+
   public static native void nativeRemoveRoutePoint(@RoutePointInfo.RouteMarkType int markType,
                                                    int intermediateIndex);
+
+  public static native void nativeRemoveIntermediateRoutePoints();
+
   public static native boolean nativeCouldAddIntermediatePoint();
   @NonNull
   public static native RouteMarkData[] nativeGetRoutePoints();
diff --git a/android/src/com/mapswithme/maps/routing/RoutingController.java b/android/src/com/mapswithme/maps/routing/RoutingController.java
index e76108e712..9c829a6580 100644
--- a/android/src/com/mapswithme/maps/routing/RoutingController.java
+++ b/android/src/com/mapswithme/maps/routing/RoutingController.java
@@ -457,6 +457,11 @@ public class RoutingController
       mContainer.onRemovedStop();
   }
 
+  public void removeIntermediatePoints()
+  {
+    Framework.nativeRemoveIntermediateRoutePoints();
+  }
+
   public boolean isStopPointAllowed()
   {
     return Framework.nativeCouldAddIntermediatePoint();
diff --git a/map/routing_manager.cpp b/map/routing_manager.cpp
index 6f5e647027..8a8ab0db49 100644
--- a/map/routing_manager.cpp
+++ b/map/routing_manager.cpp
@@ -417,6 +417,14 @@ void RoutingManager::RemoveRoutePoint(RouteMarkType type, int8_t intermediateInd
   routePoints.RemoveRoutePoint(type, intermediateIndex);
 }
 
+void RoutingManager::RemoveIntermediateRoutePoints()
+{
+  ASSERT(m_bmManager != nullptr, ());
+  UserMarkControllerGuard guard(*m_bmManager, UserMarkType::ROUTING_MARK);
+  RoutePointsLayout routePoints(guard.m_controller);
+  routePoints.RemoveIntermediateRoutePoints();
+}
+
 void RoutingManager::MoveRoutePoint(RouteMarkType currentType, int8_t currentIntermediateIndex,
                                     RouteMarkType targetType, int8_t targetIntermediateIndex)
 {
diff --git a/map/routing_manager.hpp b/map/routing_manager.hpp
index 6ca6213a4f..900b1aed5a 100644
--- a/map/routing_manager.hpp
+++ b/map/routing_manager.hpp
@@ -164,7 +164,9 @@ public:
   void GenerateTurnNotifications(std::vector<std::string> & turnNotifications);
 
   void AddRoutePoint(RouteMarkData && markData);
+  std::vector<RouteMarkData> GetRoutePoints() const;
   void RemoveRoutePoint(RouteMarkType type, int8_t intermediateIndex = 0);
+  void RemoveIntermediateRoutePoints();
   void MoveRoutePoint(RouteMarkType currentType, int8_t currentIntermediateIndex,
                       RouteMarkType targetType, int8_t targetIntermediateIndex);
   void HideRoutePoint(RouteMarkType type, int8_t intermediateIndex = 0);
@@ -210,8 +212,6 @@ public:
                                   int32_t & minRouteAltitude, int32_t & maxRouteAltitude,
                                   measurement_utils::Units & altitudeUnits) const;
 
-  std::vector<RouteMarkData> GetRoutePoints() const;
-
 private:
   void InsertRoute(routing::Route const & route);
   bool IsTrackingReporterEnabled() const;
diff --git a/map/routing_mark.cpp b/map/routing_mark.cpp
index 6073b950f0..1b369beb30 100644
--- a/map/routing_mark.cpp
+++ b/map/routing_mark.cpp
@@ -143,6 +143,18 @@ bool RoutePointsLayout::RemoveRoutePoint(RouteMarkType type, int8_t intermediate
   return true;
 }
 
+void RoutePointsLayout::RemoveIntermediateRoutePoints()
+{
+  for (size_t i = 0; i < m_routeMarks.GetUserMarkCount();)
+  {
+    RouteMarkPoint const * mark = static_cast<RouteMarkPoint const *>(m_routeMarks.GetUserMark(i));
+    if (mark->GetRoutePointType() == RouteMarkType::Intermediate)
+      m_routeMarks.DeleteUserMark(i);
+    else
+      ++i;
+  }
+}
+
 bool RoutePointsLayout::MoveRoutePoint(RouteMarkType currentType, int8_t currentIntermediateIndex,
                                        RouteMarkType destType, int8_t destIntermediateIndex)
 {
diff --git a/map/routing_mark.hpp b/map/routing_mark.hpp
index 5fb7b22e70..2c6b5a8f5f 100644
--- a/map/routing_mark.hpp
+++ b/map/routing_mark.hpp
@@ -71,6 +71,7 @@ public:
   RouteMarkPoint * GetRoutePoint(RouteMarkType type, int8_t intermediateIndex = 0);
   std::vector<RouteMarkPoint *> GetRoutePoints();
   bool RemoveRoutePoint(RouteMarkType type, int8_t intermediateIndex = 0);
+  void RemoveIntermediateRoutePoints();
   bool MoveRoutePoint(RouteMarkType currentType, int8_t currentIntermediateIndex,
                       RouteMarkType destType, int8_t destIntermediateIndex);