diff --git a/map/traffic_manager.cpp b/map/traffic_manager.cpp
index adfac2118..47a6799f7 100644
--- a/map/traffic_manager.cpp
+++ b/map/traffic_manager.cpp
@@ -629,8 +629,7 @@ void TrafficManager::ThreadRoutine()
   m_lastDrapeUpdate = steady_clock::now();
   m_lastObserverUpdate = steady_clock::now();
 
-  std::vector<MwmSet::MwmId> mwms;
-  while (WaitForRequest(mwms))
+  while (WaitForRequest())
   {
     // TODO clean out expired messages
 
@@ -698,14 +697,14 @@ void TrafficManager::ThreadRoutine()
         m_trafficETags[mwm] = tag;
       }
     }
-#endif
     mwms.clear();
+#endif
   }
   // Calling Unsubscribe() form the worker thread on exit makes thread synchronization easier
   Unsubscribe();
 }
 
-bool TrafficManager::WaitForRequest(std::vector<MwmSet::MwmId> & mwms)
+bool TrafficManager::WaitForRequest()
 {
   std::unique_lock<std::mutex> lock(m_mutex);
 
diff --git a/map/traffic_manager.hpp b/map/traffic_manager.hpp
index 3cfd5f0db..71b87e945 100644
--- a/map/traffic_manager.hpp
+++ b/map/traffic_manager.hpp
@@ -289,7 +289,7 @@ private:
    * @return `true` during normal operation, `false` during teardown (signaling the event loop to exit).
    */
   // TODO mwms argument is no longer needed
-  bool WaitForRequest(std::vector<MwmSet::MwmId> & mwms);
+  bool WaitForRequest();
 
   /**
    * @brief Processes new traffic data.