diff --git a/rpcs3/Emu/Cell/SPUThread.cpp b/rpcs3/Emu/Cell/SPUThread.cpp
index a955b34c3e..0118ff85b4 100644
--- a/rpcs3/Emu/Cell/SPUThread.cpp
+++ b/rpcs3/Emu/Cell/SPUThread.cpp
@@ -5031,9 +5031,6 @@ bool spu_thread::stop_and_signal(u32 code)
 						flags += cpu_flag::stop + cpu_flag::ret;
 						return true;
 					});
-
-					if (thread.get() != this)
-						thread_ctrl::notify(*thread);
 				}
 			}
 
@@ -5043,6 +5040,18 @@ bool spu_thread::stop_and_signal(u32 code)
 			break;
 		}
 
+		for (auto& thread : group->threads)
+		{
+			if (thread)
+			{
+				// Notify threads, guess which threads need a notification by checking cpu_flag::ret (redundant notification can only occur if thread has called an exit syscall itself as well)
+				if (thread.get() != this && thread->state & cpu_flag::ret)
+				{
+					thread_ctrl::notify(*thread);
+				}
+			}
+		}
+	
 		check_state();
 		return true;
 	}
diff --git a/rpcs3/Emu/Cell/lv2/sys_spu.cpp b/rpcs3/Emu/Cell/lv2/sys_spu.cpp
index 9013d98ea4..57450aafe3 100644
--- a/rpcs3/Emu/Cell/lv2/sys_spu.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_spu.cpp
@@ -1009,6 +1009,20 @@ error_code sys_spu_thread_group_start(ppu_thread& ppu, u32 id)
 		return CELL_ESRCH;
 	}
 
+	struct notify_on_exit
+	{
+		usz index = umax;
+		std::array<spu_thread*, 8> threads; // Raw pointer suffices, as long as group is referenced its SPUs exist
+
+		~notify_on_exit() noexcept
+		{
+			for (; index != umax; index--)
+			{
+				threads[index]->state.notify_one(cpu_flag::stop);
+			}
+		}
+	} notify_threads;
+
 	std::lock_guard lock(group->mutex);
 
 	// SPU_THREAD_GROUP_STATUS_READY state is not used
@@ -1061,7 +1075,7 @@ error_code sys_spu_thread_group_start(ppu_thread& ppu, u32 id)
 		if (thread && ran_threads--)
 		{
 			thread->state -= cpu_flag::stop;
-			thread->state.notify_one(cpu_flag::stop);
+			notify_threads.threads[++notify_threads.index] = thread.get();
 		}
 	}
 
@@ -1169,6 +1183,20 @@ error_code sys_spu_thread_group_resume(ppu_thread& ppu, u32 id)
 		return CELL_EINVAL;
 	}
 
+	struct notify_on_exit
+	{
+		usz index = umax;
+		std::array<spu_thread*, 8> threads; // Raw pointer suffices, as long as group is referenced its SPUs exist
+
+		~notify_on_exit() noexcept
+		{
+			for (; index != umax; index--)
+			{
+				threads[index]->state.notify_one(cpu_flag::suspend);
+			}
+		}
+	} notify_threads;
+
 	std::lock_guard lock(group->mutex);
 
 	CellError error;
@@ -1218,7 +1246,7 @@ error_code sys_spu_thread_group_resume(ppu_thread& ppu, u32 id)
 		if (thread)
 		{
 			thread->state -= cpu_flag::suspend;
-			thread->state.notify_one(cpu_flag::suspend);
+			notify_threads.threads[++notify_threads.index] = thread.get();
 		}
 	}