diff --git a/transport/ServiceManagement.cpp b/transport/ServiceManagement.cpp
index 9eccede..5ba3ec3 100644
--- a/transport/ServiceManagement.cpp
+++ b/transport/ServiceManagement.cpp
@@ -300,11 +300,23 @@
         return Void();
     }
 
-    void wait() {
+    void wait(const std::string &interface, const std::string &instanceName) {
+        using std::literals::chrono_literals::operator""s;
+
         std::unique_lock<std::mutex> lock(mMutex);
-        mCondition.wait(lock, [this]{
-            return mRegistered;
-        });
+        while(true) {
+            mCondition.wait_for(lock, 1s, [this]{
+                return mRegistered;
+            });
+
+            if (mRegistered) {
+                break;
+            }
+
+            LOG(WARNING) << "Waited one second for "
+                         << interface << "/" << instanceName
+                         << ". Waiting another...";
+        }
     }
 
 private:
@@ -338,7 +350,7 @@
         return;
     }
 
-    waiter->wait();
+    waiter->wait(interface, instanceName);
 }
 
 }; // namespace details