1 files changed, 5 insertions, 1 deletions
diff --git a/src/init.cpp b/src/init.cpp
index 62250664e3..798c24a2a8 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -193,9 +193,13 @@ void Shutdown()
     }
 #endif
     MapPort(false);
+
+    // Because these depend on each-other, we make sure that neither can be
+    // using the other before destroying them.
     UnregisterValidationInterface(peerLogic.get());
-    g_connman.reset();
+    g_connman->Stop();
     peerLogic.reset();
+    g_connman.reset();
 
     StopTorControl();
     if (fDumpMempoolLater && gArgs.GetArg("-persistmempool", DEFAULT_PERSIST_MEMPOOL)) {