diff --git a/src/main/java/com/simibubi/create/foundation/utility/worldWrappers/WrappedChunkProvider.java b/src/main/java/com/simibubi/create/foundation/utility/worldWrappers/WrappedChunkProvider.java
index bf26318dd..4bb1dfffa 100644
--- a/src/main/java/com/simibubi/create/foundation/utility/worldWrappers/WrappedChunkProvider.java
+++ b/src/main/java/com/simibubi/create/foundation/utility/worldWrappers/WrappedChunkProvider.java
@@ -58,14 +58,7 @@ public class WrappedChunkProvider extends AbstractChunkProvider {
         if (chunks == null)
         	return null;
 
-        WrappedChunk chunk = chunks.get(pos);
-
-        if (chunk == null) {
-            chunk = new WrappedChunk(world, x, z);
-            chunks.put(pos, chunk);
-        }
-
-        return chunk;
+        return chunks.computeIfAbsent(pos, $ -> new WrappedChunk(world, x, z));
     }
 
     @Override
diff --git a/src/main/java/com/simibubi/create/foundation/utility/worldWrappers/chunk/WrappedChunk.java b/src/main/java/com/simibubi/create/foundation/utility/worldWrappers/chunk/WrappedChunk.java
index 62a2a6060..5f1132831 100644
--- a/src/main/java/com/simibubi/create/foundation/utility/worldWrappers/chunk/WrappedChunk.java
+++ b/src/main/java/com/simibubi/create/foundation/utility/worldWrappers/chunk/WrappedChunk.java
@@ -72,6 +72,11 @@ public class WrappedChunk implements IChunk {
         return sections;
     }
 
+    @Override
+    public ChunkStatus getStatus() {
+        return ChunkStatus.LIGHT;
+    }
+
     @Nullable
     @Override
     public BlockState setBlockState(BlockPos p_177436_1_, BlockState p_177436_2_, boolean p_177436_3_) {
@@ -139,11 +144,6 @@ public class WrappedChunk implements IChunk {
         return false;
     }
 
-    @Override
-    public ChunkStatus getStatus() {
-        return null;
-    }
-
     @Override
     public void removeTileEntity(BlockPos p_177425_1_) {