diff --git a/Content.Server/Entry/EntryPoint.cs b/Content.Server/Entry/EntryPoint.cs
index 360f49e7de..3a54c8a15c 100644
--- a/Content.Server/Entry/EntryPoint.cs
+++ b/Content.Server/Entry/EntryPoint.cs
@@ -41,6 +41,7 @@ namespace Content.Server.Entry
private IVoteManager _voteManager = default!;
private ServerUpdateManager _updateManager = default!;
private PlayTimeTrackingManager? _playTimeTracking;
+ private IEntitySystemManager? _sysMan;
///
public override void Init()
@@ -81,6 +82,7 @@ namespace Content.Server.Entry
_voteManager = IoCManager.Resolve();
_updateManager = IoCManager.Resolve();
_playTimeTracking = IoCManager.Resolve();
+ _sysMan = IoCManager.Resolve();
var logManager = IoCManager.Resolve();
logManager.GetSawmill("Storage").Level = LogLevel.Info;
@@ -161,7 +163,7 @@ namespace Content.Server.Entry
protected override void Dispose(bool disposing)
{
_playTimeTracking?.Shutdown();
- IoCManager.Resolve().GetEntitySystem().OnServerDispose();
+ _sysMan?.GetEntitySystemOrNull()?.OnServerDispose();
}
}
}