diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -29,7 +29,8 @@
 #ifdef ENABLE_WALLET
 #include <qt/paymentserver.h>
 #include <qt/walletcontroller.h>
-#endif
+#include <qt/walletmodel.h>
+#endif // ENABLE_WALLET
 
 #include <QDebug>
 #include <QLibraryInfo>
@@ -209,12 +210,6 @@
 
     delete window;
     window = nullptr;
-#ifdef ENABLE_WALLET
-    delete paymentServer;
-    paymentServer = nullptr;
-    delete m_wallet_controller;
-    m_wallet_controller = nullptr;
-#endif
     delete optionsModel;
     optionsModel = nullptr;
     delete platformStyle;
@@ -357,26 +352,23 @@
     // Log this only after AppInitMain finishes, as then logging setup is
     // guaranteed complete.
     qWarning() << "Platform customization:" << platformStyle->getName();
-#ifdef ENABLE_WALLET
-    m_wallet_controller =
-        new WalletController(m_node, platformStyle, optionsModel, this);
-#ifdef ENABLE_BIP70
-    PaymentServer::LoadRootCAs();
-#endif
-    if (paymentServer) {
-        paymentServer->setOptionsModel(optionsModel);
-#ifdef ENABLE_BIP70
-        connect(m_wallet_controller, &WalletController::coinsSent,
-                paymentServer, &PaymentServer::fetchPaymentACK);
-#endif
-    }
-#endif
-
     clientModel = new ClientModel(m_node, optionsModel);
     window->setClientModel(clientModel);
 #ifdef ENABLE_WALLET
-    window->setWalletController(m_wallet_controller);
+    if (WalletModel::isWalletEnabled()) {
+        m_wallet_controller =
+            new WalletController(m_node, platformStyle, optionsModel, this);
+        window->setWalletController(m_wallet_controller);
+        if (paymentServer) {
+            paymentServer->setOptionsModel(optionsModel);
+#ifdef ENABLE_BIP70
+            PaymentServer::LoadRootCAs();
+            connect(m_wallet_controller, &WalletController::coinsSent,
+                    paymentServer, &PaymentServer::fetchPaymentACK);
 #endif
+        }
+    }
+#endif // ENABLE_WALLET
 
     // If -min option passed, start window minimized(iconified)
     // or minimized to tray
@@ -692,8 +684,10 @@
     // Start up the payment server early, too, so impatient users that click on
     // bitcoincash: links repeatedly have their payment requests routed to this
     // process:
-    app.createPaymentServer();
-#endif
+    if (WalletModel::isWalletEnabled()) {
+        app.createPaymentServer();
+    }
+#endif // ENABLE_WALLET
 
     /// 9. Main GUI initialization
     // Install global event filter that makes sure that long tooltips can be