diff --git a/Content.Server/EntryPoint.cs b/Content.Server/EntryPoint.cs
index 8d56502eaa..9891a2d5a4 100644
--- a/Content.Server/EntryPoint.cs
+++ b/Content.Server/EntryPoint.cs
@@ -90,12 +90,15 @@ namespace Content.Server
         }
 
         /// <inheritdoc />
-        public override void Dispose()
+        protected override void Dispose(bool disposing)
         {
-            _server.RunLevelChanged -= HandleRunLevelChanged;
-            _players.PlayerStatusChanged -= HandlePlayerStatusChanged;
+            if (disposing)
+            {
+                _server.RunLevelChanged -= HandleRunLevelChanged;
+                _players.PlayerStatusChanged -= HandlePlayerStatusChanged;
+            }
 
-            base.Dispose();
+            base.Dispose(disposing);
         }
 
         private static void HandleRunLevelChanged(object sender, RunLevelChangedEventArgs args)
@@ -109,7 +112,7 @@ namespace Content.Server
 
                     var mapLoader = IoCManager.Resolve<IMapLoader>();
                     var mapMan = IoCManager.Resolve<IMapManager>();
-                    
+
                     var startTime = timing.RealTime;
                     {
                         var newMap = mapMan.CreateMap(new MapId(2));
diff --git a/engine b/engine
index 0da7507c64..909bb5936f 160000
--- a/engine
+++ b/engine
@@ -1 +1 @@
-Subproject commit 0da7507c6415b0051744535b93775a8b54f8538d
+Subproject commit 909bb5936f40ef0dbcfcc5e63db262f508252f5b