diff --git a/src/servers/registrar/ShutdownProcess.cpp b/src/servers/registrar/ShutdownProcess.cpp
index 6c120b6d7c..e22c754fd1 100644
--- a/src/servers/registrar/ShutdownProcess.cpp
+++ b/src/servers/registrar/ShutdownProcess.cpp
@@ -1608,7 +1608,7 @@ ShutdownProcess::_QuitNonApps()
 			PRINT(("  killing team %ld\n", teamInfo.team));
 
 			#ifdef __HAIKU__
-				kill_team(teamInfo.team);
+				send_signal(teamInfo.team, SIGKILL);
 			#else
 				// We don't want to do this when testing under R5, since it
 				// would kill all teams besides our app server and registrar.
@@ -1676,7 +1676,7 @@ ShutdownProcess::_QuitBlockingApp(AppInfoList &list, team_id team,
 	// kill the app
 	PRINT(("  killing team %ld\n", team));
 
-	kill_team(team);
+	send_signal(team, SIGKILL);
 
 	// remove the app (the roster will note eventually and send us
 	// a notification, but we want to be sure)