diff --git a/Content.Shared/Bed/SharedBedSystem.cs b/Content.Shared/Bed/SharedBedSystem.cs index 7e798111cf..0518f05fdf 100644 --- a/Content.Shared/Bed/SharedBedSystem.cs +++ b/Content.Shared/Bed/SharedBedSystem.cs @@ -56,8 +56,13 @@ public abstract class SharedBedSystem : EntitySystem private void OnUnstrapped(Entity bed, ref UnstrappedEvent args) { - _actionsSystem.RemoveAction(args.Buckle.Owner, bed.Comp.SleepAction); - _sleepingSystem.TryWaking(args.Buckle.Owner); + // If the entity being unbuckled is terminating, we shouldn't try to act upon it, as some components may be gone + if (!Terminating(args.Buckle.Owner)) + { + _actionsSystem.RemoveAction(args.Buckle.Owner, bed.Comp.SleepAction); + _sleepingSystem.TryWaking(args.Buckle.Owner); + } + RemComp(bed); }