diff --git a/app/lib/dal/fileDAL.ts b/app/lib/dal/fileDAL.ts
index 6281d83fbb597df5703258b7ffde398550a5ba07..3eec9daed29c07e055600e0bbf588e6f2b6c8c94 100644
--- a/app/lib/dal/fileDAL.ts
+++ b/app/lib/dal/fileDAL.ts
@@ -15,6 +15,7 @@ import {DBBlock} from "../db/DBBlock"
 import {DBMembership} from "./sqliteDAL/MembershipDAL"
 import {MerkleDTO} from "../dto/MerkleDTO"
 import {CommonConstants} from "../common-libs/constants"
+import { ProxyConf } from '../proxy';
 
 const fs      = require('fs')
 const path    = require('path')
@@ -842,7 +843,11 @@ export class FileDAL {
     let conf = ConfDTO.complete(overrideConf || {});
     if (!defaultConf) {
       const savedConf = await this.confDAL.loadConf();
+      const savedProxyConf = _(savedConf.proxyConf).extend({});
       conf = _(savedConf).extend(overrideConf || {});
+      if (overrideConf.proxyConf !== undefined) {} else {
+        conf.proxyConf = _(savedProxyConf).extend({});
+      }
     }
     if (this.loadConfHook) {
       await this.loadConfHook(conf)
diff --git a/index.ts b/index.ts
index 60adec3940b701616fa99b0d3539d87e82257685..ada66317cf7d88543a7254ed2163ce8f8f2739dc 100644
--- a/index.ts
+++ b/index.ts
@@ -438,7 +438,7 @@ class Stack {
   }
 }
 
-function commandLineConf(program:any, conf:ConfDTO = ConfDTO.mock()) {
+function commandLineConf(program:any, conf:any = {}) {
 
   conf = conf || {};
   const cli = {
diff --git a/server.ts b/server.ts
index f91364b266fa335e6b412bed1b7b6cff24be27ee..89772dbf0573e9eaaa25729e7d537cee03915a04 100644
--- a/server.ts
+++ b/server.ts
@@ -73,7 +73,7 @@ export class Server extends stream.Duplex implements HookableServer {
   TransactionsService:TransactionService
   private documentFIFO:GlobalFifoPromise
 
-  constructor(home:string, memoryOnly:boolean, private overrideConf:ConfDTO) {
+  constructor(home:string, memoryOnly:boolean, private overrideConf:any) {
     super({ objectMode: true })
 
     this.home = home;