diff --git a/src/k_kart.c b/src/k_kart.c
index cfc60921e..a8a2bd46e 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -8701,6 +8701,11 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
 	if (player->justbumped > 0)
 		player->justbumped--;
 
+	if (K_PlayerGuard(player) || K_PlayerEBrake(player))
+	{
+		player->instaWhipCooldown = INSTAWHIP_DROPGUARD;
+	}
+
 	if (player->instaWhipCooldown)
 	{
 		player->instaWhipCharge = 0;