diff --git a/src/js/controllers/preferencesBwsUrl.js b/src/js/controllers/preferencesBwsUrl.js
index 9d1495ccc..4ec00fd9f 100644
--- a/src/js/controllers/preferencesBwsUrl.js
+++ b/src/js/controllers/preferencesBwsUrl.js
@@ -10,7 +10,7 @@ angular.module('copayApp.controllers').controller('preferencesBwsUrlController',
     var defaults = configService.getDefaults();
     var config = configService.getSync();
 
-    this.bwsurl = config.bwsFor[walletId] || defaults.bws.url;
+    this.bwsurl = (config.bwsFor && config.bwsFor[walletId]) || defaults.bws.url;
 
     this.save = function() {
 
diff --git a/src/js/services/configService.js b/src/js/services/configService.js
index dc8ae5df5..427e31325 100644
--- a/src/js/services/configService.js
+++ b/src/js/services/configService.js
@@ -41,10 +41,6 @@ angular.module('copayApp.services').factory('configService', function(storageSer
     rates: {
       url: 'https://insight.bitpay.com:443/api/rates',
     },
-
-    bwsFor: {
-
-    },
   };
 
   var configCache = null;
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index e592f36a3..74049e9f1 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -52,7 +52,7 @@ angular.module('copayApp.services')
       var config = configService.getSync();
       var defaults = configService.getDefaults();
 
-      bwcService.setBaseUrl(config.bwsFor[walletId] || defaults.bws.url);
+      bwcService.setBaseUrl((config.bwsFor && config.bwsFor[walletId]) || defaults.bws.url);
       bwcService.setTransports(['polling']);
     }