diff --git a/app/scripts/popup-core.js b/app/scripts/popup-core.js
index 5af913e98..2e4334bb1 100644
--- a/app/scripts/popup-core.js
+++ b/app/scripts/popup-core.js
@@ -11,11 +11,11 @@ const setupMultiplex = require('./lib/stream-utils.js').setupMultiplex
 module.exports = initializePopup
 
 
-function initializePopup ({ container, connectionStream, localeMessages }, cb) {
+function initializePopup ({ container, connectionStream }, cb) {
   // setup app
   async.waterfall([
     (cb) => connectToAccountManager(connectionStream, cb),
-    (accountManager, cb) => launchMetamaskUi({ container, accountManager, localeMessages }, cb),
+    (accountManager, cb) => launchMetamaskUi({ container, accountManager }, cb),
   ], cb)
 }
 
diff --git a/app/scripts/popup.js b/app/scripts/popup.js
index fe6aae799..5f526759a 100644
--- a/app/scripts/popup.js
+++ b/app/scripts/popup.js
@@ -1,9 +1,3 @@
-// setup i18n
-// const Translator = require('../../ui/create-i18n')
-// const translator = new Translator()
-// global.translator = translator
-// global.getMessage = translator.getMessage.bind(translator)
-
 const injectCss = require('inject-css')
 const OldMetaMaskUiCss = require('../../old-ui/css')
 const NewMetaMaskUiCss = require('../../ui/css')
@@ -28,10 +22,6 @@ async function start() {
   const release = global.platform.getVersion()
   setupRaven({ release })
 
-  // Load translator
-  // await translator.setLocale('ja')
-  const localeMessages = await fetchLocale('ja')
-
   // inject css
   // const css = MetaMaskUiCss()
   // injectCss(css)
@@ -47,7 +37,7 @@ async function start() {
 
   // start ui
   const container = document.getElementById('app-content')
-  startPopup({ container, connectionStream, localeMessages }, (err, store) => {
+  startPopup({ container, connectionStream }, (err, store) => {
     if (err) return displayCriticalError(err)
 
     // Code commented out until we begin auto adding users to NewUI
diff --git a/ui/index.js b/ui/index.js
index c680accfe..598d2876b 100644
--- a/ui/index.js
+++ b/ui/index.js
@@ -4,7 +4,7 @@ const Root = require('./app/root')
 const actions = require('./app/actions')
 const configureStore = require('./app/store')
 const txHelper = require('./lib/tx-helper')
-const { fetchLocale } = require('./i18n-helper').getMessage
+const { fetchLocale } = require('./i18n-helper')
 const { OLD_UI_NETWORK_TYPE, BETA_UI_NETWORK_TYPE } = require('../app/scripts/config').enums
 
 global.log = require('loglevel')
@@ -19,17 +19,19 @@ function launchMetamaskUi (opts, cb) {
   // check if we are unlocked first
   accountManager.getState(function (err, metamaskState) {
     if (err) return cb(err)
-    startApp(metamaskState, accountManager, opts.localeMessages, opts)
+    startApp(metamaskState, accountManager, opts)
       .then((store) => {
         cb(null, store)
       })
   })
 }
 
-async function startApp (metamaskState, accountManager, currentLocaleMessages, opts) {
+async function startApp (metamaskState, accountManager, opts) {
   // parse opts
   if (!metamaskState.featureFlags) metamaskState.featureFlags = {}
 
+  const currentLocaleMessages = await fetchLocale(metamaskState.currentLocale)
+
   const store = configureStore({
 
     // metamaskState represents the cross-tab state