diff --git a/bin/spvnode b/bin/spvnode
index 8e541c6e..fa52c6e4 100755
--- a/bin/spvnode
+++ b/bin/spvnode
@@ -24,7 +24,7 @@ const node = new SPVNode({
 });
 
 // Temporary hack
-if (!node.has('walletdb')) {
+if (!node.config.bool('no-wallet') && !node.has('walletdb')) {
   const plugin = require('../lib/wallet/plugin');
   node.use(plugin);
 }