diff --git a/src/k_collide.cpp b/src/k_collide.cpp
index c609ba9b5..d9e74932e 100644
--- a/src/k_collide.cpp
+++ b/src/k_collide.cpp
@@ -1101,12 +1101,14 @@ boolean K_InstaWhipCollide(mobj_t *shield, mobj_t *victim)
 			if (K_TryPickMeUp(attacker, victim, true))
 			{
 				shield->hitlag = attacker->hitlag; // players hitlag is handled in K_TryPickMeUp, and we need to set for the shield too
+				return true;
 			}
 			else
 			{
 				P_DamageMobj(victim, shield, attacker, 1, DMG_NORMAL);
 				K_AddHitLag(attacker, attackerHitlag, false);
 				shield->hitlag = attacker->hitlag;
+				return true;
 			}
 		}
 		return false;
diff --git a/src/k_kart.c b/src/k_kart.c
index d0eaa5446..4f175967b 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -14454,7 +14454,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 	// which is allowed during painstate as a last-ditch defensive option.
 	if (player && player->mo && player->mo->health > 0 && !player->spectator && !mapreset && leveltime > introtime)
 	{
-		boolean chargingwhip = (cmd->buttons & BT_ATTACK) && (player->rings <= 0) && (!player->instaWhipChargeLockout) && (!player->itemRoulette.active);
+		boolean chargingwhip = (cmd->buttons & BT_ATTACK) && (player->rings <= 0) && (!player->instaWhipChargeLockout) && (player->defenseLockout <= PUNISHWINDOW) && (!player->itemRoulette.active);
 		boolean releasedwhip = (!(cmd->buttons & BT_ATTACK)) && (player->rings <= 0 && player->instaWhipCharge) && !(P_PlayerInPain(player));
 
 		if (K_PowerUpRemaining(player, POWERUP_BADGE))
@@ -14530,7 +14530,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 				player->instaWhipCharge = 0;
 				if (!K_PowerUpRemaining(player, POWERUP_BARRIER))
 				{
-					player->defenseLockout = PUNISHWINDOW;
+					player->defenseLockout = 2*PUNISHWINDOW;
 				}
 
 				S_StartSound(player->mo, sfx_iwhp);
diff --git a/src/p_enemy.c b/src/p_enemy.c
index 017797b46..1b10dfe34 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -3503,7 +3503,8 @@ void A_AttractChase(mobj_t *actor)
 
 	if (actor->extravalue1 && actor->type != MT_EMERALD) // SRB2Kart
 	{
-		if (!actor->target || P_MobjWasRemoved(actor->target) || !actor->target->player || actor->target->player->baildrop || actor->target->player->bailcharge)
+		if (!actor->target || P_MobjWasRemoved(actor->target) || !actor->target->player
+		|| actor->target->player->baildrop || actor->target->player->bailcharge || actor->target->player->defenseLockout > PUNISHWINDOW)
 		{
 			P_RemoveMobj(actor);
 			return;
@@ -3526,7 +3527,7 @@ void A_AttractChase(mobj_t *actor)
 
 				if (actor->target->player->rings <= 10 && P_IsDisplayPlayer(actor->target->player))
 				{
-					S_ReducedVFXSoundAtVolume(actor->target, sfx_gshab, 
+					S_ReducedVFXSoundAtVolume(actor->target, sfx_gshab,
 						210 - 10*actor->target->player->rings
 					, NULL);
 
@@ -12212,7 +12213,7 @@ void A_BallhogExplode(mobj_t *actor)
 		mo2->color = actor->target->color;
 		mo2->colorized = true;
 	}
-	
+
 	P_StartQuakeFromMobj(7, 50 * actor->scale, 1024 * actor->scale, actor);
 
 	actor->fuse = 1;
diff --git a/src/p_inter.c b/src/p_inter.c
index d14d5e780..549e61d66 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -731,7 +731,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
 			if (player->instaWhipCharge)
 				return;
 
-			if (player->baildrop || player->bailcharge)
+			if (player->baildrop || player->bailcharge || player->defenseLockout > PUNISHWINDOW)
 				return;
 
 			// Don't immediately pick up spilled rings
diff --git a/src/p_map.c b/src/p_map.c
index 69de72ee1..580f0438e 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -749,7 +749,14 @@ static BlockItReturn_t PIT_CheckThing(mobj_t *thing)
 			return BMIT_CONTINUE; // overhead
 		if (g_tm.thing->z + g_tm.thing->height < thing->z)
 			return BMIT_CONTINUE; // underneath
-		K_InstaWhipCollide(g_tm.thing, thing);
+
+		boolean hit = K_InstaWhipCollide(g_tm.thing, thing);
+		if (hit && g_tm.thing->target && !P_MobjWasRemoved(g_tm.thing->target) && g_tm.thing->target->player)
+		{
+			player_t *attacker = g_tm.thing->target->player;
+			if (attacker->defenseLockout > PUNISHWINDOW)
+				attacker->defenseLockout -= PUNISHWINDOW;
+		}
 		return BMIT_CONTINUE;
 	}
 
@@ -4197,7 +4204,7 @@ static void P_BouncePlayerMove(mobj_t *mo, TryMoveResult_t *result)
 		if (mo->eflags & MFE_VERTICALFLIP)
 			mo->momz -= 40*mo->scale;
 		else
-			mo->momz += 40*mo->scale; 
+			mo->momz += 40*mo->scale;
 	}
 
 	mo->momx = tmxmove;