1 files changed, 2 insertions, 3 deletions
diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index fa470dd89..fb60a5b3e 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -27,7 +27,7 @@ class KeyringController extends EventEmitter {
   constructor (opts) {
     super()
     const initState = opts.initState || {}
-    this.keyringTypes = keyringTypes
+    this.keyringTypes = opts.keyringTypes || keyringTypes
     this.store = new ObservableStore(initState)
     this.memStore = new ObservableStore({
       isUnlocked: false,
@@ -35,8 +35,7 @@ class KeyringController extends EventEmitter {
       keyrings: [],
       identities: {},
     })
-    this.accountTracker = opts.accountTracker
-    this.encryptor = encryptor
+    this.encryptor = opts.encryptor || encryptor
     this.keyrings = []
     this.getNetwork = opts.getNetwork
   }