diff --git a/Engine.Core/Systems/UniverseEntranceManager.cs b/Engine.Core/Systems/UniverseEntranceManager.cs
index 64bf3a8..c16512b 100644
--- a/Engine.Core/Systems/UniverseEntranceManager.cs
+++ b/Engine.Core/Systems/UniverseEntranceManager.cs
@@ -17,6 +17,7 @@ public class UniverseEntranceManager : Internal.BehaviourIndependent
     protected override void OnEnteredUniverse(IUniverse universe)
     {
         enterUniverses.Assign(universe);
+        exitUniverses.Assign(universe);
 
         foreach (IUniverseObject universeObject in universe.UniverseObjects)
             OnUniverseObjectRegistered(universe, new(universeObject));
@@ -28,6 +29,7 @@ public class UniverseEntranceManager : Internal.BehaviourIndependent
     protected override void OnExitedUniverse(IUniverse universe)
     {
         enterUniverses.Unassign();
+        exitUniverses.Unassign();
 
         foreach (IUniverseObject universeObject in universe.UniverseObjects)
             OnUniverseObjectUnRegistered(universe, new(universeObject));