2 files changed, 2 insertions, 0 deletions
diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index fa470dd89..2a1af6e29 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -35,6 +35,7 @@ class KeyringController extends EventEmitter {
       keyrings: [],
       identities: {},
     })
+
     this.accountTracker = opts.accountTracker
     this.encryptor = encryptor
     this.keyrings = []
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 1dd09d0ad..30e511e19 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -96,6 +96,7 @@ module.exports = class MetamaskController extends EventEmitter {
       initState: initState.KeyringController,
       accountTracker: this.accountTracker,
       getNetwork: this.networkController.getNetworkState.bind(this.networkController),
+      encryptor: opts.encryptor || undefined,
     })
 
     // account tracker watches balances, nonces, and any code at their address.