diff --git a/map/framework.cpp b/map/framework.cpp
index b20207f3ff..8781e204e0 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -1752,6 +1752,7 @@ void Framework::StopTrackRecording()
 void Framework::SaveTrackRecordingWithName(std::string const & name)
 {
   GetBookmarkManager().SaveTrackRecording(name);
+  GpsTracker::Instance().Clear();
   if (m_drapeEngine)
     m_drapeEngine->ClearGpsTrackPoints();
 }
diff --git a/map/gps_tracker.cpp b/map/gps_tracker.cpp
index 23080815ed..9fa961adf4 100644
--- a/map/gps_tracker.cpp
+++ b/map/gps_tracker.cpp
@@ -60,6 +60,11 @@ void GpsTracker::SetEnabled(bool enabled)
     m_track.Clear();
 }
 
+void GpsTracker::Clear()
+{
+  m_track.Clear();
+}
+
 bool GpsTracker::IsEnabled() const
 {
   return m_enabled;
diff --git a/map/gps_tracker.hpp b/map/gps_tracker.hpp
index 8cce4eab0f..6840ec0c63 100644
--- a/map/gps_tracker.hpp
+++ b/map/gps_tracker.hpp
@@ -14,6 +14,7 @@ public:
 
   bool IsEnabled() const;
   void SetEnabled(bool enabled);
+  void Clear();
 
   bool IsEmpty() const;
   size_t GetTrackSize() const;