diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp
index 31cb2d8b4c..db77a1b2e4 100644
--- a/Source/Core/Core/Core.cpp
+++ b/Source/Core/Core/Core.cpp
@@ -341,6 +341,7 @@ static void CpuThread()
   {
     Common::SetCurrentThreadName("CPU-GPU thread");
     g_video_backend->Video_Prepare();
+    Host_Message(WM_USER_CREATE);
   }
 
   // This needs to be delayed until after the video backend is ready.
@@ -409,6 +410,7 @@ static void FifoPlayerThread()
   else
   {
     g_video_backend->Video_Prepare();
+    Host_Message(WM_USER_CREATE);
     Common::SetCurrentThreadName("FIFO-GPU thread");
   }
 
@@ -601,6 +603,7 @@ static void EmuThread(std::unique_ptr<BootParameters> boot)
     Common::SetCurrentThreadName("Video thread");
 
     g_video_backend->Video_Prepare();
+    Host_Message(WM_USER_CREATE);
 
     // Spawn the CPU thread
     s_cpu_thread = std::thread(cpuThreadFunc);
diff --git a/Source/Core/VideoCommon/MainBase.cpp b/Source/Core/VideoCommon/MainBase.cpp
index 2817c983a3..5f5ce785ef 100644
--- a/Source/Core/VideoCommon/MainBase.cpp
+++ b/Source/Core/VideoCommon/MainBase.cpp
@@ -194,9 +194,6 @@ void VideoBackendBase::InitializeShared()
   g_Config.UpdateProjectionHack();
   g_Config.VerifyValidity();
   UpdateActiveConfig();
-
-  // Notify the core that the video backend is ready
-  Host_Message(WM_USER_CREATE);
 }
 
 void VideoBackendBase::ShutdownShared()