diff --git a/map/gps_tracker.cpp b/map/gps_tracker.cpp
index 7bbe32dccc..a90b08e5f5 100644
--- a/map/gps_tracker.cpp
+++ b/map/gps_tracker.cpp
@@ -58,8 +58,7 @@ GpsTracker & GpsTracker::Instance()
 
 GpsTracker::GpsTracker()
   : m_enabled(GetSettingsIsEnabled())
-  , m_duration(GetSettingsDuration())
-  , m_track(GetFilePath(), kMaxItemCount, m_duration)
+  , m_track(GetFilePath(), kMaxItemCount, GetSettingsDuration())
 {
 }
 
@@ -83,12 +82,12 @@ bool GpsTracker::IsEnabled() const
 void GpsTracker::SetDuration(hours duration)
 {
   SetSettingsDuration(duration);
-  m_duration = duration;
+  m_track.SetDuration(duration);
 }
 
 hours GpsTracker::GetDuration() const
 {
-  return m_duration;
+  return m_track.GetDuration();
 }
 
 void GpsTracker::Connect(TGpsTrackDiffCallback const & fn)
diff --git a/map/gps_tracker.hpp b/map/gps_tracker.hpp
index 6832e57d89..11a6efd48c 100644
--- a/map/gps_tracker.hpp
+++ b/map/gps_tracker.hpp
@@ -27,6 +27,5 @@ private:
   GpsTracker();
 
   atomic<bool> m_enabled;
-  hours m_duration;
   GpsTrack m_track;
 };