diff --git a/app/auto_update.js b/app/auto_update.js
index c2c2884b8..424650b99 100644
--- a/app/auto_update.js
+++ b/app/auto_update.js
@@ -2,7 +2,6 @@ const autoUpdater = require('electron-updater').autoUpdater
 const { dialog } = require('electron');
 
 const config = require('./config');
-const locale = require('./locale');
 const windowState = require('./window_state');
 
 const hour = 60 * 60;
@@ -20,7 +19,7 @@ function checkForUpdates() {
 }
 
 var showingDialog = false;
-function showUpdateDialog() {
+function showUpdateDialog(messages) {
   if (showingDialog) {
     return;
   }
@@ -29,12 +28,12 @@ function showUpdateDialog() {
   const options = {
     type: 'info',
     buttons: [
-      locale.messages.autoUpdateRestartButtonLabel.message,
-      locale.messages.autoUpdateLaterButtonLabel.message
+      messages.autoUpdateRestartButtonLabel.message,
+      messages.autoUpdateLaterButtonLabel.message
     ],
-    title: locale.messages.autoUpdateNewVersionTitle.message,
-    message: locale.messages.autoUpdateNewVersionMessage.message,
-    detail: locale.messages.autoUpdateNewVersionInstructions.message,
+    title: messages.autoUpdateNewVersionTitle.message,
+    message: messages.autoUpdateNewVersionMessage.message,
+    detail: messages.autoUpdateNewVersionInstructions.message,
     defaultId: RESTART_BUTTON,
     cancelId: LATER_BUTTON
   }
@@ -53,12 +52,18 @@ function onError(error) {
   console.log("Got an error while updating: ", error.stack);
 }
 
-function initialize() {
+function initialize(messages) {
+  if (!messages) {
+    throw new Error('auto-update initialize needs localized messages');
+  }
+
   if (autoUpdateDisabled()) {
     return;
   }
 
-  autoUpdater.addListener('update-downloaded', showUpdateDialog);
+  autoUpdater.addListener('update-downloaded', function() {
+    showUpdateDialog(messages);
+  });
   autoUpdater.addListener('error', onError);
 
   checkForUpdates();
diff --git a/main.js b/main.js
index e50c62962..081b328ec 100644
--- a/main.js
+++ b/main.js
@@ -44,10 +44,6 @@ const loadLocale = require('./app/locale').load;
 let locale;
 
 function createWindow () {
-  if (!locale) {
-    locale = loadLocale();
-  }
-
   const windowOptions = Object.assign({
     width: 800,
     height: 610,
@@ -159,7 +155,11 @@ function createWindow () {
 app.on('ready', function() {
   console.log('app ready');
 
-  autoUpdate.initialize();
+  if (!locale) {
+    locale = loadLocale();
+  }
+
+  autoUpdate.initialize(locale.messages);
 
   createWindow();