diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp
index cbb4c11eca..9328386677 100644
--- a/rpcs3/Emu/System.cpp
+++ b/rpcs3/Emu/System.cpp
@@ -1351,12 +1351,13 @@ void Emulator::Stop(bool restart)
 {
 	if (m_state.exchange(system_state::stopped) == system_state::stopped)
 	{
-		m_force_boot = false;
-
 		if (restart)
 		{
 			return Load();
 		}
+
+		m_force_boot = false;
+		return;
 	}
 
 	const bool do_exit = !restart && !m_force_boot && g_cfg.misc.autoexit;