diff --git a/src/font/font.c b/src/font/font.c
index 3d7336e..7bd600d 100644
--- a/src/font/font.c
+++ b/src/font/font.c
@@ -350,6 +350,8 @@ void fontRendererInitPrerender(struct FontRenderer* renderer, struct Prerendered
             } else {
                 prerender->displayLists[imageIndex] = NULL;
             }
+        } else {
+            prerender->displayLists[imageIndex] = NULL;
         }
 
         imageMask >>= 1;
diff --git a/src/main.c b/src/main.c
index c81fbb5..a0aa785 100644
--- a/src/main.c
+++ b/src/main.c
@@ -280,6 +280,14 @@ static void gameProc(void* arg) {
                     break;
                 }
 
+                if (translationsCurrentLanguage() != gGameMenu.currentRenderedLanguage) {
+                    if (pendingGFX == 0) {
+                        gameMenuRebuildText(&gGameMenu);
+                    }
+
+                    break;
+                }
+
                 if (pendingGFX < 2 && drawingEnabled) {
                     u64 renderStart = profileStart();
                     graphicsCreateTask(&gGraphicsTasks[drawBufferIndex], gSceneCallbacks->graphicsCallback, gSceneCallbacks->data);
diff --git a/src/menu/audio_options.c b/src/menu/audio_options.c
index ac952ab..99dcd4d 100644
--- a/src/menu/audio_options.c
+++ b/src/menu/audio_options.c
@@ -9,9 +9,6 @@
 #include "../build/src/audio/clips.h"
 #include "../build/src/audio/languages.h"
 #include "./translations.h"
-#include "./game_menu.h"
-
-extern struct GameMenu gGameMenu;
 
 #define GAMEPLAY_Y      54
 #define GAMEPLAY_WIDTH  252