diff --git a/src/core/system.cpp b/src/core/system.cpp
index 839cd514b..a3909bfbb 100644
--- a/src/core/system.cpp
+++ b/src/core/system.cpp
@@ -1153,17 +1153,18 @@ bool System::BootSystem(SystemBootParameters parameters)
     return false;
   }
 
+  // Update running game, this will apply settings as well.
+  UpdateRunningGame(media ? media->GetFileName().c_str() : parameters.filename.c_str(), media.get(), true);
+
   // Check for SBI.
   if (!CheckForSBIFile(media.get()))
   {
     s_state = State::Shutdown;
+    ClearRunningGame();
     Host::OnSystemDestroyed();
     return false;
   }
 
-  // Update running game, this will apply settings as well.
-  UpdateRunningGame(media ? media->GetFileName().c_str() : parameters.filename.c_str(), media.get(), true);
-
 #ifdef WITH_CHEEVOS
   // Check for resuming with hardcore mode.
   if (!parameters.save_state.empty() && Achievements::ChallengeModeActive() &&