Merge branch 'master' into ConfigurableEncryption

1 files changed, 1 insertions, 1 deletions

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 42248827f..e4fa3518f 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -95,7 +95,7 @@ module.exports = class MetamaskController extends EventEmitter {
       initState: initState.KeyringController,
       ethStore: this.ethStore,
       getNetwork: this.networkController.getNetworkState.bind(this.networkController),
-      encryptor: opts.encryptor || undefined,
+      encryptor: opts.platform.encryptor || undefined,
     })
     this.keyringController.on('newAccount', (address) => {
       this.preferencesController.setSelectedAddress(address)