diff --git a/src/core/core.cpp b/src/core/core.cpp
index bdcee4ebd..8768ba3e6 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -494,10 +494,10 @@ void System::Shutdown(bool is_deserializing) {
                                 perf_stats->GetMeanFrametime());
 
     // Shutdown emulation session
-    GDBStub::Shutdown();
     VideoCore::Shutdown();
     HW::Shutdown();
     if (!is_deserializing) {
+        GDBStub::Shutdown();
         perf_stats.reset();
         cheat_engine.reset();
         app_loader.reset();