diff --git a/map/traffic_manager.cpp b/map/traffic_manager.cpp
index 3fe4e02e2..a439210e4 100644
--- a/map/traffic_manager.cpp
+++ b/map/traffic_manager.cpp
@@ -472,6 +472,9 @@ void TrafficManager::ThreadRoutine()
 
   while (WaitForRequest())
   {
+    if (!IsEnabled())
+      continue;
+
     // TODO clean out expired messages
 
     LOG(LINFO, ("start loop, active MWMs changed:", m_activeMwmsChanged, ", poll needed:", m_isPollNeeded));