diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 3ba0b31aa..6ac5ab551 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -2291,6 +2291,8 @@ void CL_ClearPlayer(INT32 playernum)
 	splitscreen_original_party_size[playernum] = 0;
 
 	memset(&players[playernum], 0, sizeof (player_t));
+
+	RemoveAdminPlayer(playernum); // don't stay admin after you're gone
 }
 
 //
@@ -2348,11 +2350,6 @@ void CL_RemovePlayer(INT32 playernum, kickreason_t reason)
 
 	player_name_changes[playernum] = 0;
 
-	if (IsPlayerAdmin(playernum))
-	{
-		RemoveAdminPlayer(playernum); // don't stay admin after you're gone
-	}
-
 	LUA_InvalidatePlayer(&players[playernum]);
 
 	K_CheckBumpers();