diff --git a/Content.Shared/Pulling/Components/SharedPullableComponent.cs b/Content.Shared/Pulling/Components/SharedPullableComponent.cs index c32909e896..01dc333b4f 100644 --- a/Content.Shared/Pulling/Components/SharedPullableComponent.cs +++ b/Content.Shared/Pulling/Components/SharedPullableComponent.cs @@ -69,7 +69,9 @@ namespace Content.Shared.Pulling.Components var message = new PullStoppedMessage(oldPullerPhysics, _physics); eventBus.RaiseLocalEvent(oldPuller.Uid, message, broadcast: false); - eventBus.RaiseLocalEvent(Owner.Uid, message); + + if (Owner.LifeStage <= EntityLifeStage.MapInitialized) + eventBus.RaiseLocalEvent(Owner.Uid, message); _physics.WakeBody(); }