diff --git a/src/p_user.c b/src/p_user.c
index 82e5fa3f..5842aca8 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -8523,11 +8523,6 @@ void P_PlayerThink(player_t *player)
 			const tic_t griefval = cv_antigrief.value * TICRATE;
 			const UINT8 n = player - players;
 
-		if (n != serverplayer
-#ifndef DEVELOP
-			&& !IsPlayerAdmin(n)
-#endif
-			)
 			{
 				if (player->grieftime > griefval)
 				{
@@ -8536,7 +8531,11 @@ void P_PlayerThink(player_t *player)
 
 					if (server)
 					{
-						if (player->griefstrikes > 2)
+						if ((player->griefstrikes > 2)
+#ifndef DEVELOP
+							&& !IsPlayerAdmin(n)
+#endif
+							&& !P_IsLocalPlayer(player)) // P_IsMachineLocalPlayer for DRRR
 						{
 							// Send kick
 							XBOXSTATIC UINT8 buf[2];