diff --git a/src/init.cpp b/src/init.cpp
index e4cb2f1d00c..48fd5ae97fc 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -45,6 +45,7 @@ enum BindFlags {
     BF_REPORT_ERROR = (1U << 1)
 };
 
+
 //////////////////////////////////////////////////////////////////////////////
 //
 // Shutdown
@@ -99,6 +100,7 @@ void Shutdown()
     StopRPCThreads();
     ShutdownRPCMining();
     bitdb.Flush(false);
+    GenerateBitcoins(false, NULL);
     StopNode();
     {
         LOCK(cs_main);
diff --git a/src/net.cpp b/src/net.cpp
index 8929919f03a..7a1fcc50334 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1850,7 +1850,6 @@ void StartNode(boost::thread_group& threadGroup)
 bool StopNode()
 {
     printf("StopNode()\n");
-    GenerateBitcoins(false, NULL);
     MapPort(false);
     nTransactionsUpdated++;
     if (semOutbound)