diff --git a/LibCarla/source/carla/client/detail/Simulator.cpp b/LibCarla/source/carla/client/detail/Simulator.cpp
index 014b833b3..898624e57 100644
--- a/LibCarla/source/carla/client/detail/Simulator.cpp
+++ b/LibCarla/source/carla/client/detail/Simulator.cpp
@@ -57,6 +57,10 @@ namespace detail {
         break;
       }
     }
+    if(result) {
+      carla::traffic_manager::TrafficManager::Tick();
+    }
+    
     return result;
   }
 
@@ -202,9 +206,6 @@ namespace detail {
 
     // tick pedestrian navigation
     _episode->NavigationTick();
-    
-    // tick traffic manager
-    carla::traffic_manager::TrafficManager::Tick();
 
     auto result = _episode->WaitForState(timeout);
     if (!result.has_value()) {
@@ -219,9 +220,6 @@ namespace detail {
     // tick pedestrian navigation
     _episode->NavigationTick();
     
-    // tick traffic manager
-    carla::traffic_manager::TrafficManager::Tick();
-
     // send tick command
     const auto frame = _client.SendTickCue();