diff --git a/services/tunnelbroker/src/Amqp/AmqpManager.h b/services/tunnelbroker/src/Amqp/AmqpManager.h
--- a/services/tunnelbroker/src/Amqp/AmqpManager.h
+++ b/services/tunnelbroker/src/Amqp/AmqpManager.h
@@ -15,14 +15,16 @@
 class AmqpManager {
   AmqpManager(){};
 
+  std::once_flag initOnceFlag;
   std::unique_ptr<AMQP::TcpChannel> amqpChannel;
   std::atomic<bool> amqpReady;
   std::atomic<int64_t> lastConnectionTimestamp;
   void connectInternal();
+  void connect();
 
 public:
   static AmqpManager &getInstance();
-  void connect();
+  void init();
   bool send(const database::MessageItem *message);
   void ack(uint64_t deliveryTag);
 
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
@@ -17,6 +17,13 @@
   return instance;
 }
 
+void AmqpManager::init() {
+  std::call_once(initOnceFlag, [&]() {
+    std::thread amqpClientThread([&]() { this->connect(); });
+    amqpClientThread.detach();
+  });
+}
+
 void AmqpManager::connectInternal() {
   const std::string amqpUri = config::ConfigManager::getInstance().getParameter(
       config::ConfigManager::OPTION_AMQP_URI);
diff --git a/services/tunnelbroker/src/server.cpp b/services/tunnelbroker/src/server.cpp
--- a/services/tunnelbroker/src/server.cpp
+++ b/services/tunnelbroker/src/server.cpp
@@ -32,19 +32,14 @@
   server->Wait();
 }
 
-void RunAmqpClient() {
-  AmqpManager::getInstance().connect();
-}
-
 } // namespace network
 } // namespace comm
 
 int main(int argc, char **argv) {
   comm::network::tools::InitLogging("tunnelbroker");
   comm::network::config::ConfigManager::getInstance().load();
-  std::thread amqpThread(comm::network::RunAmqpClient);
+  comm::network::AmqpManager::getInstance().init();
   std::thread grpcThread(comm::network::RunServer);
-  amqpThread.join();
   grpcThread.join();
   return 0;
 }
diff --git a/services/tunnelbroker/test/AmqpManagerTest.cpp b/services/tunnelbroker/test/AmqpManagerTest.cpp
--- a/services/tunnelbroker/test/AmqpManagerTest.cpp
+++ b/services/tunnelbroker/test/AmqpManagerTest.cpp
@@ -16,7 +16,7 @@
 protected:
   virtual void SetUp() {
     config::ConfigManager::getInstance().load();
-    std::thread amqpThread([]() { AmqpManager::getInstance().connect(); });
+    AmqpManager::getInstance().init();
   }
 };