diff --git a/rpcs3/Emu/Cell/PPUThread.cpp b/rpcs3/Emu/Cell/PPUThread.cpp
index e63a85adac..7c0018461f 100644
--- a/rpcs3/Emu/Cell/PPUThread.cpp
+++ b/rpcs3/Emu/Cell/PPUThread.cpp
@@ -2225,7 +2225,7 @@ void ppu_thread::cpu_sleep()
 
 void ppu_thread::cpu_on_stop()
 {
-	if (current_function)
+	if (current_function && is_stopped())
 	{
 		if (start_time)
 		{
@@ -2235,10 +2235,10 @@ void ppu_thread::cpu_on_stop()
 		{
 			ppu_log.warning("'%s' aborted", current_function);
 		}
-
-		current_function = {};
 	}
 
+	current_function = {};
+
 	// TODO: More conditions
 	if (Emu.IsStopped() && g_cfg.core.ppu_debug)
 	{