diff --git a/lib/cmds/blockchain/blockchain.js b/lib/cmds/blockchain/blockchain.js
index 1a9e8f86..bcb6dcce 100644
--- a/lib/cmds/blockchain/blockchain.js
+++ b/lib/cmds/blockchain/blockchain.js
@@ -76,9 +76,12 @@ var Blockchain = function(options) {
 };
 
 Blockchain.prototype.setupProxy = function() {
+  this.config.proxy = true;
   if (this.blockchainConfig.proxy === false) {
+    this.config.proxy = false;
     return;
   }
+
   const proxy = require('../../core/proxy');
   const Ipc = require('../../core/ipc');
 
diff --git a/test/blockchain.js b/test/blockchain.js
index e9dfc40d..4590236b 100644
--- a/test/blockchain.js
+++ b/test/blockchain.js
@@ -1,5 +1,6 @@
 /*globals describe, it*/
 const Blockchain = require('../lib/cmds/blockchain/blockchain');
+const constants = require('../lib/constants.json');
 
 const assert = require('assert');
 
@@ -39,10 +40,15 @@ describe('embark.Blockchain', function () {
           targetGasLimit: false,
           fast: false,
           light: false,
-          verbosity: undefined
+          verbosity: undefined,
+          proxy: true
         };
         let blockchain = new Blockchain(config, 'geth');
 
+        if(config.proxy){
+          config.wsPort += constants.blockchain.servicePortOnProxy;
+          config.rpcPort += constants.blockchain.servicePortOnProxy;
+        }
         assert.deepEqual(blockchain.config, config);
         done();
       });
@@ -77,10 +83,16 @@ describe('embark.Blockchain', function () {
           targetGasLimit: false,
           fast: false,
           light: false,
-          verbosity: undefined
+          verbosity: undefined,
+          proxy: true
         };
         let blockchain = new Blockchain(config, 'geth');
 
+        if(config.proxy){
+          config.wsPort += constants.blockchain.servicePortOnProxy;
+          config.rpcPort += constants.blockchain.servicePortOnProxy;
+        }
+
         assert.deepEqual(blockchain.config, config);
         done();
       });