3 files changed, 6 insertions, 2 deletions
diff --git a/src/init.cpp b/src/init.cpp
index e108036439..8f7cef20c1 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1522,6 +1522,8 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     connOptions.nMaxOutbound = std::min(MAX_OUTBOUND_CONNECTIONS, connOptions.nMaxConnections);
     connOptions.nBestHeight = chainActive.Height();
     connOptions.uiInterface = &uiInterface;
+    connOptions.nSendBufferMaxSize = 1000*GetArg("-maxsendbuffer", DEFAULT_MAXSENDBUFFER);
+    connOptions.nReceiveFloodSize = 1000*GetArg("-maxreceivebuffer", DEFAULT_MAXRECEIVEBUFFER);
 
     if(!connman.Start(threadGroup, scheduler, strNodeError, connOptions))
         return InitError(strNodeError);
diff --git a/src/net.cpp b/src/net.cpp
index 8ea600b371..9b18a32743 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -2063,8 +2063,8 @@ bool CConnman::Start(boost::thread_group& threadGroup, CScheduler& scheduler, st
     nMaxConnections = connOptions.nMaxConnections;
     nMaxOutbound = std::min((connOptions.nMaxOutbound), nMaxConnections);
 
-    nSendBufferMaxSize = 1000*GetArg("-maxsendbuffer", DEFAULT_MAXSENDBUFFER);
-    nReceiveFloodSize = 1000*GetArg("-maxreceivebuffer", DEFAULT_MAXRECEIVEBUFFER);
+    nSendBufferMaxSize = connOptions.nSendBufferMaxSize;
+    nReceiveFloodSize = connOptions.nSendBufferMaxSize;
 
     SetBestHeight(connOptions.nBestHeight);
 
diff --git a/src/net.h b/src/net.h
index 8067ee68a7..a50066da9a 100644
--- a/src/net.h
+++ b/src/net.h
@@ -117,6 +117,8 @@ public:
         int nMaxOutbound = 0;
         int nBestHeight = 0;
         CClientUIInterface* uiInterface = nullptr;
+        unsigned int nSendBufferMaxSize = 0;
+        unsigned int nReceiveFloodSize = 0;
     };
     CConnman();
     ~CConnman();