diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp
index b6d0dd1d1a..774fac41ce 100644
--- a/Source/Core/Core/Core.cpp
+++ b/Source/Core/Core/Core.cpp
@@ -295,9 +295,6 @@ void Stop()  // - Hammertime!
 
   ResetRumble();
 
-#ifdef USE_MEMORYWATCHER
-  s_memory_watcher.reset();
-#endif
 }
 
 void DeclareAsCPUThread()
@@ -374,6 +371,10 @@ static void CpuThread(const std::optional<std::string>& savestate_path, bool del
   // Enter CPU run loop. When we leave it - we are done.
   CPU::Run();
 
+#ifdef USE_MEMORYWATCHER
+  s_memory_watcher.reset();
+#endif
+
   s_is_started = false;
 
   if (_CoreParameter.bFastmem)