diff --git a/Assets/Scripts/Game/Main/ServerGameLoop.cs b/Assets/Scripts/Game/Main/ServerGameLoop.cs
index a450f0a..7ba0c10 100644
--- a/Assets/Scripts/Game/Main/ServerGameLoop.cs
+++ b/Assets/Scripts/Game/Main/ServerGameLoop.cs
@@ -84,7 +84,8 @@ public class ServerGameWorld
 
 #pragma warning disable 618
         // we're keeping World.Active until we can properly remove them all
-        var defaultWorld = World.Active;
+        //var defaultWorld = World.Active;
+        var defaultWorld = World.DefaultGameObjectInjectionWorld;
         try
         {
             m_GameModeSystem = m_GameWorld.CreateSystem<GameModeSystemServer>(m_GameWorld, m_GameWorld.GetExistingSystem<ChatSystemServer>());
@@ -109,7 +110,9 @@ public class ServerGameWorld
         }
         finally
         {
-            World.Active = defaultWorld;
+
+            //World.Active = defaultWorld;
+            World.DefaultGameObjectInjectionWorld = defaultWorld;
         }
 #pragma warning restore 618