diff --git a/map/routing_manager.cpp b/map/routing_manager.cpp
index b3df14242b..870800afa3 100644
--- a/map/routing_manager.cpp
+++ b/map/routing_manager.cpp
@@ -314,8 +314,10 @@ RoutingManager::RoutingManager(Callbacks && callbacks, Delegate & delegate)
   , m_delegate(delegate)
   , m_trackingReporter(platform::CreateSocket(), TRACKING_REALTIME_HOST, TRACKING_REALTIME_PORT,
                        tracking::Reporter::kPushDelayMs)
-  // TODO(o.khlopkova) uncomment after platform background uploader is ready.
-  //, m_trackingReporterArchive(TRACKING_HISTORICAL_HOST)
+  //TODO (o.khlopkova) remove ifdef when all platforms are ready.
+#if defined(OMIM_OS_ANDROID)
+  , m_trackingReporterArchive(TRACKING_HISTORICAL_HOST)
+#endif
   , m_extrapolator(
         [this](location::GpsInfo const & gpsInfo) { this->OnExtrapolatedLocationUpdate(gpsInfo); })
 {
@@ -484,14 +486,16 @@ void RoutingManager::OnLocationUpdate(location::GpsInfo const & info)
 {
   m_extrapolator.OnLocationUpdate(info);
 
+  //TODO (o.khlopkova) remove ifdef when all platforms are ready.
+#if defined(OMIM_OS_ANDROID)
   if (IsTrackingReporterArchiveEnabled())
   {
-    // TODO(o.khlopkova) uncomment after platform background uploader is ready.
-    // location::GpsInfo gpsInfo(info);
-    // auto routeMatchingInfo = GetRouteMatchingInfo(gpsInfo);
-    // m_trackingReporterArchive.Insert(m_currentRouterType, info,
-    //                                m_routingSession.MatchTraffic(routeMatchingInfo));
+     location::GpsInfo gpsInfo(info);
+     auto routeMatchingInfo = GetRouteMatchingInfo(gpsInfo);
+     m_trackingReporterArchive.Insert(m_currentRouterType, info,
+                                    m_routingSession.MatchTraffic(routeMatchingInfo));
   }
+#endif
 }
 
 RouterType RoutingManager::GetBestRouter(m2::PointD const & startPoint,
diff --git a/map/routing_manager.hpp b/map/routing_manager.hpp
index 0dcb29833d..25bdd86cc0 100644
--- a/map/routing_manager.hpp
+++ b/map/routing_manager.hpp
@@ -26,6 +26,8 @@
 
 #include "base/thread_checker.hpp"
 
+#include "std/target_os.hpp"
+
 #include <chrono>
 #include <functional>
 #include <map>
@@ -367,8 +369,10 @@ private:
   routing::RoutingSession m_routingSession;
   Delegate & m_delegate;
   tracking::Reporter m_trackingReporter;
-  // TODO(o.khlopkova) uncomment after platform background uploader is ready.
-  // tracking::ArchivalReporter m_trackingReporterArchive;
+  // TODO(o.khlopkova) remove ifdef when all platforms are ready.
+#if defined(OMIM_OS_ANDROID)
+  tracking::ArchivalReporter m_trackingReporterArchive;
+#endif
   BookmarkManager * m_bmManager = nullptr;
   extrapolation::Extrapolator m_extrapolator;