diff --git a/src/k_kart.c b/src/k_kart.c
index 72758e2f2..b5095e775 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -3792,7 +3792,8 @@ static void K_GetKartBoostPower(player_t *player)
 
 	if (player->spinouttimer && player->wipeoutslow == 1) // Slow down after you've been bumped
 	{
-		player->boostpower = player->speedboost = player->accelboost = 0;
+		player->boostpower = player->speedboost = player->accelboost = player->prevspeedboost = 0;
+		K_ClearBoost(player);
 		return;
 	}
 
@@ -7647,11 +7648,6 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
 	if (!K_IsPlayerDamaged(player) && !player->wipeoutslow)
 		player->boostangle = player->mo->angle;
 
-	if (P_PlayerInPain(player))
-	{
-		player->prevspeedboost = 0;
-	}
-
 	K_GetKartBoostPower(player);
 
 	// Special effect objects!