diff --git a/src/k_kart.c b/src/k_kart.c
index b5d92e244..f7fd7deeb 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -11581,9 +11581,18 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 
 		if (K_PowerUpRemaining(player, POWERUP_BADGE))
 		{
+			if (P_PlayerInPain(player))
+			{
+				releasedwhip = false;
+				player->instaWhipCharge = 0;
+			}
+			else
+			{
+				releasedwhip = (ATTACK_IS_DOWN && player->rings <= 0 && player->itemflags & IF_USERINGS);
+				player->instaWhipCharge = INSTAWHIP_CHARGETIME;
+			}
+
 			chargingwhip = false;
-			releasedwhip = (ATTACK_IS_DOWN && player->rings <= 0 && player->itemflags & IF_USERINGS);
-			player->instaWhipCharge = INSTAWHIP_CHARGETIME;
 			player->instaWhipCooldown = 0;
 		}