diff --git a/public/scripts/localization.js b/public/scripts/localization.js
index 9ee98b3..405bc2e 100644
--- a/public/scripts/localization.js
+++ b/public/scripts/localization.js
@@ -14,13 +14,6 @@ class Localization {
         Localization.initialLocale = storedLanguageCode && Localization.isSupported(storedLanguageCode)
             ? storedLanguageCode
             : Localization.systemLocale;
-
-        Localization
-            .setTranslation(Localization.initialLocale)
-            .then(_ => {
-                console.log("Initial translation successful.");
-                Events.fire("initial-translation-loaded");
-            });
     }
 
     static isSupported(locale) {
@@ -41,6 +34,10 @@ class Localization {
             || Localization.defaultLocale;
     }
 
+    async setInitialTranslation() {
+        await Localization.setTranslation(Localization.initialLocale)
+    }
+
     static async setTranslation(locale) {
         if (!locale) locale = Localization.systemLocale;
 
diff --git a/public/scripts/main.js b/public/scripts/main.js
index d0ec8a1..e999753 100644
--- a/public/scripts/main.js
+++ b/public/scripts/main.js
@@ -18,22 +18,25 @@ class PairDrop {
         const themeUI = new ThemeUI();
         const backgroundCanvas = new BackgroundCanvas();
 
-        Events.on('initial-translation-loaded', _ => {
-            // FooterUI needs translations
-            const footerUI = new FooterUI();
-
-            Events.on('fade-in-ui', _ => this.fadeInUI())
-            Events.on('fade-in-header', _ => this.fadeInHeader())
-
-            // Evaluate UI elements and fade in UI
-            this.evaluateUI();
-
-            // Load deferred assets
-            this.loadDeferredAssets();
-        });
-
-        // Translate page -> fires 'initial-translation-loaded' on finish
+        // Translate page before fading in
         const localization = new Localization();
+        localization
+            .setInitialTranslation()
+            .then(() => {
+                console.log("Initial translation successful.");
+
+                // FooterUI needs translations
+                const footerUI = new FooterUI();
+
+                Events.on('fade-in-ui', _ => this.fadeInUI())
+                Events.on('fade-in-header', _ => this.fadeInHeader())
+
+                // Evaluate UI elements and fade in UI
+                this.evaluateUI();
+
+                // Load deferred assets
+                this.loadDeferredAssets();
+            })
     }
 
     registerServiceWorker() {