diff --git a/src/main/java/org/ultramine/server/MultiWorld.java b/src/main/java/org/ultramine/server/MultiWorld.java
index c194f4f..36cf57e 100644
--- a/src/main/java/org/ultramine/server/MultiWorld.java
+++ b/src/main/java/org/ultramine/server/MultiWorld.java
@@ -70,8 +70,11 @@
 	@SubscribeEvent
 	public void onWorldUnload(WorldEvent.Unload event)
 	{
-		dimToWorldMap.remove(event.world.provider.dimensionId);
-		nameToWorldMap.remove(event.world.getWorldInfo().getWorldName());
+		if(!event.world.isRemote)
+		{
+			dimToWorldMap.remove(event.world.provider.dimensionId);
+			nameToWorldMap.remove(event.world.getWorldInfo().getWorldName());
+		}
 	}
 	
 	@SideOnly(Side.SERVER)