diff --git a/Content.Server/Gravity/EntitySystems/WeightlessSystem.cs b/Content.Server/Gravity/EntitySystems/WeightlessSystem.cs index 88da9b10c7..cf86734ad0 100644 --- a/Content.Server/Gravity/EntitySystems/WeightlessSystem.cs +++ b/Content.Server/Gravity/EntitySystems/WeightlessSystem.cs @@ -34,9 +34,11 @@ namespace Content.Server.Gravity.EntitySystems public void AddAlert(AlertsComponent status) { var xform = Transform(status.Owner); - var alerts = _alerts.GetOrNew(xform.GridID); - - alerts.Add(status); + if (xform.GridUid != null) + { + var alerts = _alerts.GetOrNew(xform.GridUid.Value); + alerts.Add(status); + } if (_mapManager.TryGetGrid(xform.GridUid, out var grid)) {