diff --git a/src/k_items.c b/src/k_items.c
index cdbad1d39..604f5014a 100644
--- a/src/k_items.c
+++ b/src/k_items.c
@@ -2515,6 +2515,7 @@ void K_PlayerItemThink(player_t *player, boolean onground)
 		{
 			player->itemamount--;
 			player->flametimer = (itemtime*3);
+			player->flamedash = 0;
 			mobj_t *shield = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_FLAMESHIELD);
 			P_SetScale(shield, (shield->destscale = (5*shield->destscale)>>2));
 			P_SetTarget(&shield->target, player->mo);
diff --git a/src/k_kart.c b/src/k_kart.c
index 9191117e8..377ab59cd 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -7764,7 +7764,10 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
 	if (player->flamestore)
 	{
 		if (--player->flamestore == 0)
+		{
 			S_StopSoundByID(player->mo, sfx_s3kd3l);
+			player->flamedash = 0;
+		}
 	}
 
 	if (player->flametimer > 0)