diff --git a/src/core/system.cpp b/src/core/system.cpp
index 40ad38257..773580a1b 100644
--- a/src/core/system.cpp
+++ b/src/core/system.cpp
@@ -4138,9 +4138,8 @@ void System::ShutdownSystem(bool save_resume_state)
   if (save_resume_state)
     SaveResumeState();
 
-  if (s_system_executing)
-    s_state = State::Stopping;
-  else
+  s_state = State::Stopping;
+  if (!s_system_executing)
     DestroySystem();
 }