diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp
index f54e477be3..f5bd36ab9b 100644
--- a/Source/Core/Core/Core.cpp
+++ b/Source/Core/Core/Core.cpp
@@ -237,7 +237,7 @@ static void ResetRumble()
 // Called from GUI thread
 void Stop()  // - Hammertime!
 {
-  if (GetState() == State::Stopping)
+  if (GetState() == State::Stopping || GetState() == State::Uninitialized)
     return;
 
   const SConfig& _CoreParameter = SConfig::GetInstance();