diff --git a/Content.Server/Movement/Systems/LagCompensationSystem.cs b/Content.Server/Movement/Systems/LagCompensationSystem.cs index 6ffd55c6b9..9b30372696 100644 --- a/Content.Server/Movement/Systems/LagCompensationSystem.cs +++ b/Content.Server/Movement/Systems/LagCompensationSystem.cs @@ -57,6 +57,9 @@ public sealed class LagCompensationSystem : EntitySystem private void OnLagMove(EntityUid uid, LagCompensationComponent component, ref MoveEvent args) { + if (!args.NewPosition.EntityId.IsValid()) + return; // probably being sent to nullspace for deletion. + EnsureComp(uid); component.Positions.Enqueue((_timing.CurTime, args.NewPosition, args.NewRotation)); }