diff --git a/scripts/zm/_zm_reimagined.gsc b/scripts/zm/_zm_reimagined.gsc
index b4415de8..c1cd2c39 100644
--- a/scripts/zm/_zm_reimagined.gsc
+++ b/scripts/zm/_zm_reimagined.gsc
@@ -3643,8 +3643,7 @@ additionalprimaryweapon_indicator()
 
 		if (self hasPerk("specialty_additionalprimaryweapon") && isDefined(self.a_saved_weapon) && self getCurrentWeapon() == self.a_saved_weapon["name"])
 		{
-			hud fadeOverTime(0.5);
-			hud.alpha = 1;
+			self thread additionalprimaryweapon_indicator_show_and_hide(hud);
 		}
 		else
 		{
@@ -3654,6 +3653,23 @@ additionalprimaryweapon_indicator()
 	}
 }
 
+additionalprimaryweapon_indicator_show_and_hide(hud)
+{
+	self endon("disconnect");
+	self endon("player_downed");
+	self endon("spawned_player");
+	self endon("weapon_change");
+	self endon("specialty_additionalprimaryweapon_stop");
+
+	hud fadeOverTime(0.5);
+	hud.alpha = 1;
+
+	wait 1.5;
+
+	hud fadeOverTime(0.5);
+	hud.alpha = 0;
+}
+
 additionalprimaryweapon_stowed_weapon_refill()
 {
 	self endon("disconnect");