diff --git a/src/apps/debugger/gui/team_window/TeamWindow.cpp b/src/apps/debugger/gui/team_window/TeamWindow.cpp
index 8aad931767..73b2dcf4bf 100644
--- a/src/apps/debugger/gui/team_window/TeamWindow.cpp
+++ b/src/apps/debugger/gui/team_window/TeamWindow.cpp
@@ -74,14 +74,10 @@ TeamWindow::~TeamWindow()
 	fDebugModel->GetTeam()->RemoveListener(this);
 	fDebugModel->RemoveListener(this);
 
-	if (fActiveSourceCode != NULL)
-		fActiveSourceCode->RemoveReference();
-	if (fActiveStackFrame != NULL)
-		fActiveStackFrame->RemoveReference();
-	if (fActiveStackTrace != NULL)
-		fActiveStackTrace->RemoveReference();
-	if (fActiveThread != NULL)
-		fActiveThread->RemoveReference();
+	_SetActiveSourceCode(NULL);
+	_SetActiveStackFrame(NULL);
+	_SetActiveStackTrace(NULL);
+	_SetActiveThread(NULL);
 }