diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp
index 2f0cebcb15..80f8613ace 100644
--- a/rpcs3/Emu/System.cpp
+++ b/rpcs3/Emu/System.cpp
@@ -2064,6 +2064,8 @@ void Emulator::Stop(bool restart)
 
 	sys_log.notice("Atomic wait hashtable stats: [in_use=%u, used=%u, max_collision_weight=%u, total_collisions=%u]", aw_refs, aw_used, aw_colm, aw_colc);
 
+	stop_watchdog = thread_state::aborting;
+
 	m_stop_ctr++;
 	m_stop_ctr.notify_all();