diff --git a/src/p_enemy.c b/src/p_enemy.c
index a815651f6..72c0fbb8d 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -3515,9 +3515,10 @@ void A_AttractChase(mobj_t *actor)
 		// 2. ALL conditions that deleted flingrings off you didn't decrement pickuprings, desyncing your ring count
 		boolean stale = (!actor->target || P_MobjWasRemoved(actor->target) || !actor->target->player);
 
-		boolean legacy_blocked = (actor->target->player->baildrop || actor->target->player->bailcharge || actor->target->player->defenseLockout > PUNISHWINDOW);
-		boolean new_blocked = (actor->target->player->baildrop || actor->target->player->bailcharge);
-		boolean blocked = (G_CompatLevel(0x0010) ? legacy_blocked : new_blocked);
+		boolean blocked = (actor->target->player->baildrop || actor->target->player->bailcharge);
+		if (G_CompatLevel(0x0010))
+			blocked |= (actor->target->player->defenseLockout > PUNISHWINDOW);
+
 		if (stale || blocked)
 		{
 			if (!G_CompatLevel(0x0010) && !stale)