diff --git a/src/js/services/configService.js b/src/js/services/configService.js
index 6e0e67871..9af77287d 100644
--- a/src/js/services/configService.js
+++ b/src/js/services/configService.js
@@ -125,6 +125,8 @@ angular.module('copayApp.services').factory('configService', function(storageSer
   root.set = function(newOpts, cb) {
     var config = lodash.cloneDeep(defaultConfig);
     storageService.getConfig(function(err, oldOpts) {
+      oldOpts = oldOpts || {};
+
       if (lodash.isString(oldOpts)) {
         oldOpts = JSON.parse(oldOpts);
       }
@@ -134,6 +136,7 @@ angular.module('copayApp.services').factory('configService', function(storageSer
       if (lodash.isString(newOpts)) {
         newOpts = JSON.parse(newOpts);
       }
+
       lodash.merge(config, oldOpts, newOpts);
       configCache = config;