diff --git a/app/scripts/inpage.js b/app/scripts/inpage.js
index 599604a82..419f78cd6 100644
--- a/app/scripts/inpage.js
+++ b/app/scripts/inpage.js
@@ -52,7 +52,7 @@ reloadStream.once('data', triggerReload)
 
 // set web3 defaultAccount
 inpageProvider.publicConfigStore.subscribe(function (state) {
-  web3.eth.defaultAccount = state.PreferencesController.selectedAddress
+  web3.eth.defaultAccount = state.selectedAddress
 })
 
 //
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index fc7df5137..2c379f8d9 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -156,7 +156,7 @@ module.exports = class MetamaskController extends EventEmitter {
     function selectPublicState(state) {
       const result = { selectedAddress: undefined }
       try {
-        result.selectedAddress = state.KeyringController.selectedAddress
+        result.selectedAddress = state.PreferencesController.selectedAddress
       } catch (_) {}
       return result
     }