1 files changed, 3 insertions, 2 deletions
diff --git a/cpp/lib/broker/Broker.cpp b/cpp/lib/broker/Broker.cpp
index 079eb5fd73..b9e7990861 100644
--- a/cpp/lib/broker/Broker.cpp
+++ b/cpp/lib/broker/Broker.cpp
@@ -30,7 +30,6 @@
 #include "NullMessageStore.h"
 #include "ProtocolInitiation.h"
 #include "Connection.h"
-#include "sys/SessionContext.h"
 #include "sys/ConnectionInputHandler.h"
 #include "sys/ConnectionInputHandlerFactory.h"
 #include "sys/TimeoutHandler.h"
@@ -97,7 +96,9 @@ void Broker::shutdown() {
     acceptor->shutdown();
 }
 
-Broker::~Broker() { }
+Broker::~Broker() {
+    shutdown();
+}
 
 const int16_t Broker::DEFAULT_PORT(5672);