diff --git a/Content.Client/_RMC14/Weapons/Ranged/Prediction/GunPredictionSystem.cs b/Content.Client/_RMC14/Weapons/Ranged/Prediction/GunPredictionSystem.cs
index 884074b5c7..9f700146a0 100644
--- a/Content.Client/_RMC14/Weapons/Ranged/Prediction/GunPredictionSystem.cs
+++ b/Content.Client/_RMC14/Weapons/Ranged/Prediction/GunPredictionSystem.cs
@@ -7,8 +7,6 @@
 using Robust.Client.GameObjects;
 using Robust.Client.Physics;
 using Robust.Client.Player;
-using Robust.Shared;
-using Robust.Shared.Configuration;
 using Robust.Shared.Map;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Events;
@@ -19,7 +17,6 @@ namespace Content.Client._RMC14.Weapons.Ranged.Prediction;
 
 public sealed class GunPredictionSystem : SharedGunPredictionSystem
 {
-    [Dependency] private readonly IConfigurationManager _config = default!;
     [Dependency] private readonly SharedGunSystem _gun = default!;
     [Dependency] private readonly PhysicsSystem _physics = default!;
     [Dependency] private readonly IPlayerManager _player = default!;
@@ -27,14 +24,19 @@ public sealed class GunPredictionSystem : SharedGunPredictionSystem
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
 
+    private EntityQuery<IgnorePredictionHideComponent> _ignorePredictionHideQuery;
+    private EntityQuery<SpriteComponent> _spriteQuery;
+
     public override void Initialize()
     {
         base.Initialize();
 
+        _ignorePredictionHideQuery = GetEntityQuery<IgnorePredictionHideComponent>();
+        _spriteQuery = GetEntityQuery<SpriteComponent>();
+
         SubscribeLocalEvent<PhysicsUpdateBeforeSolveEvent>(OnBeforeSolve);
         SubscribeLocalEvent<PhysicsUpdateAfterSolveEvent>(OnAfterSolve);
         SubscribeLocalEvent<RequestShootEvent>(OnShootRequest);
-        SubscribeNetworkEvent<MaxLinearVelocityMsg>(OnLinearVelocityMsg);
 
         SubscribeLocalEvent<PredictedProjectileClientComponent, UpdateIsPredictedEvent>(OnClientProjectileUpdateIsPredicted);
         SubscribeLocalEvent<PredictedProjectileClientComponent, StartCollideEvent>(OnClientProjectileStartCollide);
@@ -76,11 +78,6 @@ private void OnShootRequest(RequestShootEvent ev, EntitySessionEventArgs args)
         _gun.ShootRequested(ev.Gun, ev.Coordinates, ev.Target, null, args.SenderSession);
     }
 
-    private void OnLinearVelocityMsg(MaxLinearVelocityMsg ev)
-    {
-        _config.SetCVar(CVars.MaxLinVelocity, ev.Velocity);
-    }
-
     private void OnClientProjectileUpdateIsPredicted(Entity<PredictedProjectileClientComponent> ent, ref UpdateIsPredictedEvent args)
     {
         args.IsPredicted = true;
@@ -111,7 +108,13 @@ private void OnServerProjectileStartup(Entity<PredictedProjectileServerComponent
         if (!GunPrediction)
             return;
 
-        if (ent.Comp.ClientEnt == _player.LocalEntity && TryComp(ent, out SpriteComponent? sprite))
+        if (ent.Comp.ClientEnt != _player.LocalEntity)
+            return;
+
+        if (_ignorePredictionHideQuery.HasComp(ent))
+            return;
+
+        if (_spriteQuery.TryComp(ent, out var sprite))
             sprite.Visible = false;
     }
 
diff --git a/Content.Server/_RMC14/Weapons/Ranged/Prediction/GunPredictionSystem.cs b/Content.Server/_RMC14/Weapons/Ranged/Prediction/GunPredictionSystem.cs
index 105457d741..9727c9fbce 100644
--- a/Content.Server/_RMC14/Weapons/Ranged/Prediction/GunPredictionSystem.cs
+++ b/Content.Server/_RMC14/Weapons/Ranged/Prediction/GunPredictionSystem.cs
@@ -1,21 +1,13 @@
-using Content.Server.GameTicking;
-using Content.Server.Movement.Components;
-using Content.Server.Movement.Systems;
+using Content.Server.Movement.Components;
 using Content.Server.Weapons.Ranged.Systems;
 using Content.Shared._RMC14.CCVar;
 using Content.Shared._RMC14.Weapons.Ranged.Prediction;
-using Content.Shared.Coordinates;
 using Content.Shared.GameTicking;
-using Content.Shared.Physics;
 using Content.Shared.Projectiles;
 using Content.Shared.Weapons.Ranged.Events;
 using Robust.Server.GameObjects;
-using Robust.Server.Player;
-using Robust.Shared;
 using Robust.Shared.Configuration;
-using Robust.Shared.Enums;
 using Robust.Shared.Map;
-using Robust.Shared.Network;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Events;
@@ -28,11 +20,8 @@ namespace Content.Server._RMC14.Weapons.Ranged.Prediction;
 public sealed class GunPredictionSystem : SharedGunPredictionSystem
 {
     [Dependency] private readonly IConfigurationManager _config = default!;
-    [Dependency] private readonly LagCompensationSystem _lagCompensation = default!;
     [Dependency] private readonly GunSystem _gun = default!;
-    [Dependency] private readonly INetManager _net = default!;
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
-    [Dependency] private readonly IPlayerManager _player = default!;
     [Dependency] private readonly SharedProjectileSystem _projectile = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly TransformSystem _transform = default!;
@@ -66,33 +55,23 @@ public override void Initialize()
         SubscribeLocalEvent<RoundRestartCleanupEvent>(OnRoundRestartCleanup);
         SubscribeNetworkEvent<RequestShootEvent>(OnShootRequest);
         SubscribeNetworkEvent<PredictedProjectileHitEvent>(OnPredictedProjectileHit);
-        SubscribeLocalEvent<GameRunLevelChangedEvent>(OnSendLinearVelocityAll);
 
         SubscribeLocalEvent<PredictedProjectileServerComponent, MapInitEvent>(OnPredictedMapInit);
         SubscribeLocalEvent<PredictedProjectileServerComponent, ComponentRemove>(OnPredictedRemove);
         SubscribeLocalEvent<PredictedProjectileServerComponent, EntityTerminatingEvent>(OnPredictedRemove);
         SubscribeLocalEvent<PredictedProjectileServerComponent, PreventCollideEvent>(OnPredictedPreventCollide);
 
-        Subs.CVar(_config, CVars.MaxLinVelocity, OnSendLinearVelocityAll);
         Subs.CVar(_config, RMCCVars.RMCGunPredictionPreventCollision, v => _preventCollision = v, true);
         Subs.CVar(_config, RMCCVars.RMCGunPredictionLogHits, v => _logHits = v, true);
         Subs.CVar(_config, RMCCVars.RMCGunPredictionCoordinateDeviation, v => _coordinateDeviation = v, true);
         Subs.CVar(_config, RMCCVars.RMCGunPredictionLowestCoordinateDeviation, v => _lowestCoordinateDeviation = v, true);
         Subs.CVar(_config, RMCCVars.RMCGunPredictionAabbEnlargement, v => _aabbEnlargement = v, true);
 
-        _player.PlayerStatusChanged += OnPlayerStatusChanged;
-    }
-
-    public override void Shutdown()
-    {
-        base.Shutdown();
-        _player.PlayerStatusChanged -= OnPlayerStatusChanged;
     }
 
     private void OnRoundRestartCleanup(RoundRestartCleanupEvent ev)
     {
         _predicted.Clear();
-        OnSendLinearVelocityAll(ev);
     }
 
     private void OnShootRequest(RequestShootEvent ev, EntitySessionEventArgs args)
@@ -124,16 +103,6 @@ private void OnPredictedProjectileHit(PredictedProjectileHitEvent ev, EntitySess
         _predictedHits.Add((ev, args.SenderSession));
     }
 
-    private void OnSendLinearVelocityAll<T>(T ev)
-    {
-        if (_net.IsClient)
-            return;
-
-        // TODO gun prediction remove this when we pull engine with a replicated physics maxlinvelocity
-        var msg = new MaxLinearVelocityMsg(_config.GetCVar(CVars.MaxLinVelocity));
-        RaiseNetworkEvent(msg);
-    }
-
     private void OnPredictedPreventCollide(Entity<PredictedProjectileServerComponent> ent, ref PreventCollideEvent args)
     {
         if (!_preventCollision)
@@ -162,16 +131,6 @@ private void OnPredictedPreventCollide(Entity<PredictedProjectileServerComponent
         }
     }
 
-    private void OnPlayerStatusChanged(object? sender, SessionStatusEventArgs e)
-    {
-        if (e.NewStatus != SessionStatus.Connected && e.NewStatus != SessionStatus.InGame)
-            return;
-
-        // TODO gun prediction remove this when we pull engine with a replicated physics maxlinvelocity
-        var msg = new MaxLinearVelocityMsg(_config.GetCVar(CVars.MaxLinVelocity));
-        RaiseNetworkEvent(msg, e.Session.Channel);
-    }
-
     private bool Collides(
         Entity<PredictedProjectileServerComponent, PhysicsComponent> projectile,
         Entity<LagCompensationComponent, FixturesComponent, PhysicsComponent, TransformComponent> other,
diff --git a/Content.Shared/_RMC14/Weapons/Ranged/Prediction/MaxLinearVelocityMsg.cs b/Content.Shared/_RMC14/Weapons/Ranged/Prediction/MaxLinearVelocityMsg.cs
deleted file mode 100644
index 087270abfd..0000000000
--- a/Content.Shared/_RMC14/Weapons/Ranged/Prediction/MaxLinearVelocityMsg.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Robust.Shared.Serialization;
-
-namespace Content.Shared._RMC14.Weapons.Ranged.Prediction;
-
-[Serializable, NetSerializable]
-public sealed class MaxLinearVelocityMsg(float velocity) : EntityEventArgs
-{
-    public float Velocity = velocity;
-}