diff --git a/chunky/src/java/se/llbit/chunky/world/EmptyChunk.java b/chunky/src/java/se/llbit/chunky/world/EmptyChunk.java
index aac2807ad..dd1ed4a26 100644
--- a/chunky/src/java/se/llbit/chunky/world/EmptyChunk.java
+++ b/chunky/src/java/se/llbit/chunky/world/EmptyChunk.java
@@ -45,7 +45,7 @@ public class EmptyChunk extends Chunk {
   }
 
   private EmptyChunk() {
-    super(new ChunkPosition(0, 0), EmptyDimension.INSTANCE);
+    super(new ChunkPosition(0, 0), EmptyWorld.INSTANCE.currentDimension());
     surface = IconLayer.CORRUPT;
   }
 
diff --git a/chunky/src/java/se/llbit/chunky/world/EmptyDimension.java b/chunky/src/java/se/llbit/chunky/world/EmptyDimension.java
index d8bd78aeb..cf112ff99 100644
--- a/chunky/src/java/se/llbit/chunky/world/EmptyDimension.java
+++ b/chunky/src/java/se/llbit/chunky/world/EmptyDimension.java
@@ -3,9 +3,7 @@
 import java.util.Collections;
 
 public class EmptyDimension extends Dimension {
-  public static final EmptyDimension INSTANCE = new EmptyDimension();
-
-  private EmptyDimension() {
+  EmptyDimension() {
     super(EmptyWorld.INSTANCE, Dimension.Identifier.OVERWORLD, null, Collections.emptySet());
   }
 
diff --git a/chunky/src/java/se/llbit/chunky/world/EmptyRegionChunk.java b/chunky/src/java/se/llbit/chunky/world/EmptyRegionChunk.java
index 8ec109eda..029f66458 100644
--- a/chunky/src/java/se/llbit/chunky/world/EmptyRegionChunk.java
+++ b/chunky/src/java/se/llbit/chunky/world/EmptyRegionChunk.java
@@ -44,7 +44,7 @@ public class EmptyRegionChunk extends Chunk {
   }
 
   private EmptyRegionChunk() {
-    super(new ChunkPosition(0, 0), EmptyDimension.INSTANCE);
+    super(new ChunkPosition(0, 0), EmptyWorld.INSTANCE.currentDimension());
     surface = IconLayer.CORRUPT;
   }
 
diff --git a/chunky/src/java/se/llbit/chunky/world/EmptyWorld.java b/chunky/src/java/se/llbit/chunky/world/EmptyWorld.java
index b584e4f4b..d302150b4 100644
--- a/chunky/src/java/se/llbit/chunky/world/EmptyWorld.java
+++ b/chunky/src/java/se/llbit/chunky/world/EmptyWorld.java
@@ -28,10 +28,16 @@ public class EmptyWorld extends World {
 
   private EmptyWorld() {
     super("[empty world]", null, 0, -1);
-    this.currentDimension = EmptyDimension.INSTANCE;
+    this.currentDimension = new EmptyDimension();
   }
 
-  @Override public String toString() {
+  @Override
+  public void loadDimension(Dimension.Identifier dimensionId) {
+    // no-op
+  }
+
+  @Override
+  public String toString() {
     return "[empty world]";
   }