diff --git a/Dalamud.Boot/rewrite_entrypoint.cpp b/Dalamud.Boot/rewrite_entrypoint.cpp
index d01f05b2a..3b24c02c3 100644
--- a/Dalamud.Boot/rewrite_entrypoint.cpp
+++ b/Dalamud.Boot/rewrite_entrypoint.cpp
@@ -393,10 +393,10 @@ DllExport void WINAPI RewrittenEntryPoint(RewrittenEntryPointParameters& params)
                 loadInfo = params.pLoadInfo;
 
                 // Let the game initialize.
-                //SetEvent(params.hMainThreadContinue);
+                SetEvent(params.hMainThreadContinue);
             }
 
-            //wait_for_game_window();
+            wait_for_game_window();
 
             Initialize(&loadInfo[0], params.hMainThreadContinue);
             return 0;
diff --git a/Dalamud/Dalamud.cs b/Dalamud/Dalamud.cs
index 102c09ec5..e9fef946e 100644
--- a/Dalamud/Dalamud.cs
+++ b/Dalamud/Dalamud.cs
@@ -110,8 +110,9 @@ namespace Dalamud
                 Service<HookManager>.Set();
 
                 // Signal the main game thread to continue
-                NativeFunctions.SetEvent(this.mainThreadContinueEvent);
-                Log.Information("[T1] Game thread continued!");
+                // TODO: This is done in rewrite_entrypoint.cpp again to avoid a race condition. Should be fixed!
+                // NativeFunctions.SetEvent(this.mainThreadContinueEvent);
+                // Log.Information("[T1] Game thread continued!");
 
                 // Initialize FFXIVClientStructs function resolver
                 using (Timings.Start("CS Resolver Init"))