diff --git a/src/system/kernel/team.cpp b/src/system/kernel/team.cpp
index 63d0d4d8ec..8c85d0bd78 100644
--- a/src/system/kernel/team.cpp
+++ b/src/system/kernel/team.cpp
@@ -2459,7 +2459,7 @@ wait_for_child(pid_t child, uint32 flags, siginfo_t& _info,
 				childrenExist = team->children != NULL;
 			} else if (child < -1) {
 				childrenExist = has_children_in_group(team, -child);
-			} else {
+			} else if (child != team->id) {
 				if (Team* childTeam = Team::Get(child)) {
 					BReference<Team> childTeamReference(childTeam, true);
 					TeamLocker childTeamLocker(childTeam);