diff --git a/map/framework.cpp b/map/framework.cpp
index 34266a93b0..707ae3eece 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -93,6 +93,7 @@ namespace
 
   char const kRouterTypeKey[] = "router";
   char const kMapStyleKey[] = "MapStyleKeyV1";
+  char const kGpsTrackingEnabledKey[] = "GpsTrackingEnabled";
   char const kAllow3dKey[] = "Allow3d";
   char const kAllow3dBuildingsKey[] = "Buildings3d";
 
@@ -212,6 +213,12 @@ Framework::Framework()
     mapStyle = MapStyleClear;
   GetStyleReader().SetCurrentStyle(static_cast<MapStyle>(mapStyle));
 
+  // Restore gps tracking enabled
+  bool gpsTrackingEnabled = false;
+  if (!Settings::Get(kGpsTrackingEnabledKey, gpsTrackingEnabled))
+    gpsTrackingEnabled = false;
+  m_gpsTrackingEnabled = gpsTrackingEnabled;
+
   m_ParsedMapApi.SetBookmarkManager(&m_bmManager);
 
   // Init strings bundle.
@@ -1333,6 +1340,8 @@ void Framework::EnableGpsTracking(bool enabled)
 
   m_gpsTrackingEnabled = enabled;
 
+  Settings::Set(kGpsTrackingEnabledKey, enabled);
+
   if (enabled)
   {
     m_gpsTrack.Clear();