diff --git a/src/servers/debug/DebugServer.cpp b/src/servers/debug/DebugServer.cpp
index d11b687b2b..2e696e161e 100644
--- a/src/servers/debug/DebugServer.cpp
+++ b/src/servers/debug/DebugServer.cpp
@@ -419,7 +419,6 @@ TeamDebugHandler::_PopMessage(DebugMessage *&message)
 }
 
 // _EnterDebugger
-
 thread_id
 TeamDebugHandler::_EnterDebugger()
 {
@@ -798,13 +797,13 @@ TeamDebugHandler::_HandlerThread()
 	if (kill) {
 		// kill the team
 		_KillTeam();
-
-		// remove this handler from the roster and delete it
-		TeamDebugHandlerRoster::Default()->RemoveHandler(fTeam);
-
-		delete this;
 	}
 
+	// remove this handler from the roster and delete it
+	TeamDebugHandlerRoster::Default()->RemoveHandler(fTeam);
+
+	delete this;
+
 	return B_OK;
 }