diff --git a/kml/serdes.cpp b/kml/serdes.cpp
index 50d6bf2cdd..5e576f56ae 100644
--- a/kml/serdes.cpp
+++ b/kml/serdes.cpp
@@ -673,13 +673,9 @@ void KmlParser::ParseAndAddPoints(MultiGeometry::LineT & line, std::string_view
   {
     geometry::PointWithAltitude point;
     if (ParsePointWithAltitude(v, coordSeparator, point))
-    {
-      // We don't expect vertical surfaces, so do not compare heights here.
-      // Will get a lot of duplicating points otherwise after import some user KMLs.
-      // https://github.com/organicmaps/organicmaps/issues/3895
-      if (line.empty() || !AlmostEqualAbs(line.back().GetPoint(), point.GetPoint(), kMwmPointAccuracy))
-        line.emplace_back(point);
-    }
+      line.emplace_back(point);
+    else
+      LOG(LWARNING, ("Can not parse KML coordinates from", v));
   });
 }
 
diff --git a/map/bookmark_helpers.cpp b/map/bookmark_helpers.cpp
index dc3b900f6f..d72634717d 100644
--- a/map/bookmark_helpers.cpp
+++ b/map/bookmark_helpers.cpp
@@ -206,6 +206,58 @@ void ValidateKmlData(std::unique_ptr<kml::FileData> & data)
   }
 }
 
+/// @todo(KK): This code is a temporary solution for the filtering the duplicated points in KMLs.
+/// When the deserealizer reads the data from the KML that uses <gx:Track>
+/// as a first step will be parsed the list of the timestamps <when> and than the list of the coordinates <gx:coord>.
+/// So the filtering can be done only when all the data is parsed.
+void RemoveDuplicatedTrackPoints(std::unique_ptr<kml::FileData> & data)
+{
+  for (auto & trackData : data->m_tracksData)
+  {
+    auto const & geometry = trackData.m_geometry;
+    kml::MultiGeometry validGeometry;
+
+    for (size_t lineIndex = 0; lineIndex < geometry.m_lines.size(); ++lineIndex)
+    {
+      auto const & line = geometry.m_lines[lineIndex];
+      auto const & timestamps = geometry.m_timestamps[lineIndex];
+
+      if (line.empty())
+      {
+        LOG(LWARNING, ("Empty line in track:", trackData.m_name[kml::kDefaultLang]));
+        continue;
+      }
+
+      bool const hasTimestamps = geometry.HasTimestampsFor(lineIndex);
+      if (hasTimestamps && timestamps.size() != line.size())
+        MYTHROW(kml::DeserializerKml::DeserializeException, ("Timestamps count", timestamps.size(), "doesn't match points count", line.size()));
+
+      validGeometry.m_lines.emplace_back();
+      validGeometry.m_timestamps.emplace_back();
+
+      auto & validLine = validGeometry.m_lines.back();
+      auto & validTimestamps = validGeometry.m_timestamps.back();
+
+      for (size_t pointIndex = 0; pointIndex < line.size(); ++pointIndex)
+      {
+        auto const & currPoint = line[pointIndex];
+
+        // We don't expect vertical surfaces, so do not compare heights here.
+        // Will get a lot of duplicating points otherwise after import some user KMLs.
+        // https://github.com/organicmaps/organicmaps/issues/3895
+        if (validLine.empty() || !AlmostEqualAbs(validLine.back().GetPoint(), currPoint.GetPoint(), kMwmPointAccuracy))
+        {
+          validLine.push_back(currPoint);
+          if (hasTimestamps)
+            validTimestamps.push_back(timestamps[pointIndex]);
+        }
+      }
+    }
+
+    trackData.m_geometry = std::move(validGeometry);
+  }
+}
+
 bool IsBadCharForPath(strings::UniChar c)
 {
   if (c < ' ')
@@ -466,6 +518,7 @@ std::unique_ptr<kml::FileData> LoadKmlData(Reader const & reader, KmlFileType fi
       CHECK(false, ("Not supported KmlFileType"));
     }
     ValidateKmlData(data);
+    RemoveDuplicatedTrackPoints(data);
   }
   catch (Reader::Exception const & e)
   {