diff --git a/src/init.cpp b/src/init.cpp
index f51b863f3..e782bc2b7 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -932,7 +932,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     }
 
     // disable walletbroadcast in blocksonly mode
-    if (GetBoolArg("-blocksonly", false)) {
+    if (GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY)) {
         if (SoftSetBoolArg("-whitelistalwaysrelay", false))
             LogPrintf("%s: parameter interaction: -blocksonly=1 -> setting -whitelistalwaysrelay=0\n", __func__);
 #ifdef ENABLE_WALLET
diff --git a/src/main.cpp b/src/main.cpp
index 385138d4a..5c5a2586e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5891,7 +5891,7 @@ bool static ProcessMessage(const CChainParams& chainparams, CNode* pfrom, string
                     LogPrint("net", "getheaders (%d) %s to peer=%d\n", pindexBestHeader->nHeight, inv.hash.ToString(), pfrom->id);
                 }
             } else {
-                if (!fAlreadyHave && !IsInitialBlockDownload(chainparams.GetConsensus()) && !GetBoolArg("-blocksonly", false))
+                if (!fAlreadyHave && !IsInitialBlockDownload(chainparams.GetConsensus()) && !GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY))
                     pfrom->AskFor(inv);
             }
 
diff --git a/src/net.cpp b/src/net.cpp
index 0945ab2d1..c2f76ec66 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -466,7 +466,7 @@ void CNode::PushVersion()
     else
         LogPrint("net", "send version message: version %d, blocks=%d, us=%s, peer=%d\n", PROTOCOL_VERSION, nBestHeight, addrMe.ToString(), id);
     PushMessage("version", PROTOCOL_VERSION, nLocalServices, nTime, addrYou, addrMe,
-                nLocalHostNonce, strSubVersion, nBestHeight, !GetBoolArg("-blocksonly", false));
+                nLocalHostNonce, strSubVersion, nBestHeight, !GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY));
 }