diff --git a/src/init.cpp b/src/init.cpp
index e9552da67..8d1e330a0 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -200,7 +200,6 @@ void Shutdown()
         pwalletMain->Flush(false);
 #endif
     MapPort(false);
-    g_connman->Stop();
     g_connman.reset();
 
     StopTorControl();
diff --git a/src/net.cpp b/src/net.cpp
index b39ef9f54..30513a3b9 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -2205,6 +2205,7 @@ void CConnman::DeleteNode(CNode* pnode)
 
 CConnman::~CConnman()
 {
+    Stop();
 }
 
 size_t CConnman::GetAddressCount() const