diff --git a/src/p_pspr.cpp b/src/p_pspr.cpp
index 85830ac55..49f8bcb84 100644
--- a/src/p_pspr.cpp
+++ b/src/p_pspr.cpp
@@ -208,6 +208,9 @@ void P_BringUpWeapon (player_t *player)
 	player->psprites[ps_weapon].sy = player->cheats & CF_INSTANTWEAPSWITCH
 		? WEAPONTOP : WEAPONBOTTOM;
 	P_SetPsprite (player, ps_weapon, newstate);
+	// make sure that the previous weapon's flash state is terminated.
+	// When coming here from a weapon drop it may still be active.
+	P_SetPsprite(player, ps_flash, NULL);
 }