diff --git a/src/ebusd/network.cpp b/src/ebusd/network.cpp
index 497766cd..dc5505c8 100644
--- a/src/ebusd/network.cpp
+++ b/src/ebusd/network.cpp
@@ -171,6 +171,7 @@ Network::Network(const bool local, const uint16_t port, const uint16_t httpPort,
 Network::~Network()
 {
 	stop();
+	join();
 
 	while (!m_connections.empty()) {
 		Connection* connection = m_connections.back();
@@ -179,7 +180,6 @@ Network::~Network()
 		connection->join();
 		delete connection;
 	}
-	join();
 
 	if (m_tcpServer != NULL) {
 		delete m_tcpServer;