diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index 2a1af6e29..34e008ec4 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -37,7 +37,7 @@ class KeyringController extends EventEmitter {
     })
 
     this.accountTracker = opts.accountTracker
-    this.encryptor = encryptor
+    this.encryptor = opts.encryptor || encryptor
     this.keyrings = []
     this.getNetwork = opts.getNetwork
   }