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
@@ -144,9 +144,6 @@
 }
 
 void AmqpManager::waitUntilReady() {
-  if (this->amqpReady) {
-    return;
-  }
   while (!this->amqpReady) {
     LOG(INFO) << "AMQP: Connection is not ready, waiting";
     std::this_thread::sleep_for(