diff --git a/src/k_collide.cpp b/src/k_collide.cpp
index 503481bb3..87a4a6862 100644
--- a/src/k_collide.cpp
+++ b/src/k_collide.cpp
@@ -869,7 +869,7 @@ boolean K_InstaWhipCollide(mobj_t *shield, mobj_t *victim)
 				attacker->renderflags &= ~RF_DONTDRAW;
 				attackerPlayer->spindashboost = 0;
 				attackerPlayer->sneakertimer = 0;
-				attackerPlayer->instaWhipCharge = GUARDBREAK_COOLDOWN;
+				attackerPlayer->instaWhipCharge = 0;
 				attackerPlayer->guardCooldown = GUARDBREAK_COOLDOWN;
 				attackerPlayer->flashing = 0;
 
diff --git a/src/k_kart.c b/src/k_kart.c
index 182e0a7cb..c27ad60de 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -8327,9 +8327,9 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
 	// If the button stays held, delay charge a bit.
 	if (player->instaWhipChargeLockout)
 		player->instaWhipChargeLockout--;
-	if (player->rings > 0 || player->itemamount || player->ringdelay)
+	if (player->rings > 0 || player->itemamount || player->ringdelay || player->rocketsneakertimer)
 		player->instaWhipChargeLockout = INSTAWHIP_HOLD_DELAY;
-	if (!(player->cmd.buttons & BT_ATTACK)) // Deliberate Item button release, no need to protect you from lockout
+	else if (!(player->cmd.buttons & BT_ATTACK)) // Deliberate Item button release, no need to protect you from lockout
 		player->instaWhipChargeLockout = 0;
 
 	if (player->instaWhipCharge && player->instaWhipCharge < INSTAWHIP_CHARGETIME)
@@ -11088,7 +11088,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 			player->instaWhipCooldown = 0;
 		}
 
-		if (leveltime < starttime || player->spindash || player->pflags & (PF_ITEMOUT|PF_EGGMANOUT) || player->rocketsneakertimer || player->instaWhipCooldown)
+		if (leveltime < starttime || player->pflags & (PF_ITEMOUT|PF_EGGMANOUT) || player->rocketsneakertimer || player->instaWhipCooldown)
 		{
 			chargingwhip = false;
 			player->instaWhipCharge = 0;