diff --git a/services/tunnelbroker/src/Amqp/AmqpManager.cpp b/services/tunnelbroker/src/Amqp/AmqpManager.cpp
--- a/services/tunnelbroker/src/Amqp/AmqpManager.cpp
+++ b/services/tunnelbroker/src/Amqp/AmqpManager.cpp
@@ -22,6 +22,7 @@
   std::call_once(initOnceFlag, [&]() {
     std::thread amqpClientThread([&]() { this->connect(); });
     amqpClientThread.detach();
+    waitUntilReady();
   });
 }