diff --git a/src/p_inter.c b/src/p_inter.c
index f510cf2fa..f26e34ac1 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -1910,7 +1910,7 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8 damaget
 			// spectating. Because in Free Play, this player
 			// can enter the game again, and these flags would
 			// make them intangible.
-			if (K_Cooperative() && !target->player->spectator)
+			if (!(gametyperules & GTR_CHECKPOINTS) && K_Cooperative() && !target->player->spectator)
 			{
 				target->player->pflags |= PF_ELIMINATED;
 
diff --git a/src/p_user.c b/src/p_user.c
index acf119d35..6dcac862a 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -2816,7 +2816,7 @@ static void P_DeathThink(player_t *player)
 		}
 	}
 
-	if ((player->pflags & PF_ELIMINATED) && (gametyperules & GTR_BUMPERS))
+	if ((player->pflags & PF_ELIMINATED) /*&& (gametyperules & GTR_BUMPERS)*/)
 	{
 		playerGone = true;
 	}