diff --git a/src/system/kernel/debug/system_profiler.cpp b/src/system/kernel/debug/system_profiler.cpp
index a3fa4fcbae..e5f0abb95b 100644
--- a/src/system/kernel/debug/system_profiler.cpp
+++ b/src/system/kernel/debug/system_profiler.cpp
@@ -612,9 +612,10 @@ SystemProfiler::EventOccurred(NotificationService& service,
 					locker.Unlock();
 
 					RemoveReference();
-				} else
-					_TeamRemoved(team);
+					return;
+				}
 
+				_TeamRemoved(team);
 				break;
 
 			case TEAM_EXEC: