diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs index fdae26dcc1..99739eff55 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs @@ -211,7 +211,8 @@ public abstract partial class SharedGunSystem : EntitySystem if (TagSystem.HasTag(user, "GunsDisabled")) { - Popup(Loc.GetString("gun-disabled"), user, user); + if (Timing.IsFirstTimePredicted) + Popup(Loc.GetString("gun-disabled"), user, user); return; }