diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
index 0a7d62970f..d6f068fcb1 100644
--- a/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
+++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
@@ -258,6 +258,9 @@ public sealed partial class GunSystem : SharedGunSystem
         else
             return;
 
+        if (!coordinates.IsValid(EntityManager))
+            return;
+
         var ent = Spawn(message.Prototype, coordinates);
 
         var effectXform = Transform(ent);