diff --git a/c++/carla-backend/carla_bridge.cpp b/c++/carla-backend/carla_bridge.cpp
index 48c1074..1e6b25a 100644
--- a/c++/carla-backend/carla_bridge.cpp
+++ b/c++/carla-backend/carla_bridge.cpp
@@ -944,7 +944,7 @@ public:
 
         for (int i=0; i < 200; i++)
         {
-            if (m_initiated)
+            if (m_initiated || osc.thread->isFinished())
                 break;
             carla_msleep(50);
         }