diff --git a/src/k_kart.c b/src/k_kart.c
index 5a209ab1b..a9bfe62df 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -6508,7 +6508,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 											S_StartSound(player->mo, sfx_s3k75);
 										player->kartstuff[k_bubbleblowup]++;
 										player->kartstuff[k_bubblecool] = player->kartstuff[k_bubbleblowup]*3;
-										if (player->kartstuff[k_bubbleblowup] > bubbletime+10)
+										if (player->kartstuff[k_bubbleblowup] > bubbletime*2)
 										{
 											K_ThrowKartItem(player, (player->kartstuff[k_throwdir] > 0), MT_BUBBLESHIELDTRAP, -1, 0);
 											K_PlayAttackTaunt(player->mo);
@@ -6519,6 +6519,8 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 								}
 								else
 								{
+									if (player->kartstuff[k_bubbleblowup] > bubbletime)
+										player->kartstuff[k_bubbleblowup] = bubbletime;
 									if (player->kartstuff[k_bubbleblowup])
 										player->kartstuff[k_bubbleblowup]--;
 									player->kartstuff[k_holdready] = (player->kartstuff[k_bubblecool] ? 0 : 1);