diff --git a/src/p_user.c b/src/p_user.c
index 3bc6471e6..2a67d8360 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -461,15 +461,9 @@ UINT8 P_FindHighestLap(void)
 //
 boolean P_PlayerInPain(player_t *player)
 {
-	if (player->kartstuff[k_spinouttimer] || player->kartstuff[k_squishedtimer] || player->respawn.state != RESPAWNST_NONE)
+	if (player->kartstuff[k_spinouttimer] || player->kartstuff[k_squishedtimer])
 		return true;
 
-	if (gametyperules & GTR_KARMA)
-	{
-		if (player->kartstuff[k_bumper] <= 0 && player->kartstuff[k_comebacktimer])
-			return true;
-	}
-
 	return false;
 }