diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/level/KeyedClientLevelManager.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/level/KeyedClientLevelManager.java
index daa28bf05..cb78384f6 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/level/KeyedClientLevelManager.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/level/KeyedClientLevelManager.java
@@ -13,6 +13,9 @@ public class KeyedClientLevelManager implements IKeyedClientLevelManager
 	/** This is set and managed by the ClientApi for servers with support for DH. */
 	@Nullable
 	private IServerKeyedClientLevel serverKeyedLevel = null;
+	/** Allows to keep level manager enabled between loading different keyed levels */
+	private boolean enabled = false;
+	
 	
 	
 	
@@ -37,12 +40,16 @@ public class KeyedClientLevelManager implements IKeyedClientLevelManager
 	{
 		IServerKeyedClientLevel keyedLevel = new ServerKeyedClientLevel((ClientLevel) clientLevel.getWrappedMcObject(), levelKey);
 		this.serverKeyedLevel = keyedLevel;
+		this.enabled = true;
 		return keyedLevel;
 	}
 	
 	@Override
 	public void clearKeyedLevel() { this.serverKeyedLevel = null; }
 	@Override
-	public boolean hasLevelSet() { return this.serverKeyedLevel != null; }
+	public boolean isEnabled() { return this.enabled; }
+	@Override
+	public void disable() { this.enabled = false; }
+	
 	
 }
diff --git a/coreSubProjects b/coreSubProjects
index 1b59a269e..e97e16e7d 160000
--- a/coreSubProjects
+++ b/coreSubProjects
@@ -1 +1 @@
-Subproject commit 1b59a269e6aaaeb1a6fbbf1ed5c33f542f2f06a3
+Subproject commit e97e16e7d10ecf40044a4b64b70953e393fa892c