1 files changed, 2 insertions, 0 deletions
diff --git a/cpp/src/posix/QpiddBroker.cpp b/cpp/src/posix/QpiddBroker.cpp
index 7eef187ded..b340e3e52b 100644
--- a/cpp/src/posix/QpiddBroker.cpp
+++ b/cpp/src/posix/QpiddBroker.cpp
@@ -128,6 +128,7 @@ struct QpiddDaemon : public Daemon {
         uint16_t port=brokerPtr->getPort(options->daemon.transport);
         ready(port);            // Notify parent.
         brokerPtr->run();
+        broker::SignalHandler::setBroker(0); // Delete broker in this thread.
     }
 };
 
@@ -174,6 +175,7 @@ int QpiddBroker::execute (QpiddOptions *options) {
         if (options->broker.port == 0 || myOptions->daemon.transport != TCP)
             cout << uint16_t(brokerPtr->getPort(myOptions->daemon.transport)) << endl;
         brokerPtr->run();
+        broker::SignalHandler::setBroker(0); // Delete broker in this thread.
     }
     return 0;
 }