diff --git a/src/world/ChunkManager.php b/src/world/ChunkManager.php
index 50ec60b23..e0bb90f50 100644
--- a/src/world/ChunkManager.php
+++ b/src/world/ChunkManager.php
@@ -42,7 +42,7 @@ interface ChunkManager{
 
 	public function getChunk(int $chunkX, int $chunkZ) : ?Chunk;
 
-	public function setChunk(int $chunkX, int $chunkZ, ?Chunk $chunk) : void;
+	public function setChunk(int $chunkX, int $chunkZ, Chunk $chunk) : void;
 
 	/**
 	 * Returns the height of the world
diff --git a/src/world/SimpleChunkManager.php b/src/world/SimpleChunkManager.php
index cfa67f9a5..2c7fb01c6 100644
--- a/src/world/SimpleChunkManager.php
+++ b/src/world/SimpleChunkManager.php
@@ -63,11 +63,7 @@ class SimpleChunkManager implements ChunkManager{
 		return $this->chunks[World::chunkHash($chunkX, $chunkZ)] ?? null;
 	}
 
-	public function setChunk(int $chunkX, int $chunkZ, ?Chunk $chunk) : void{
-		if($chunk === null){
-			unset($this->chunks[World::chunkHash($chunkX, $chunkZ)]);
-			return;
-		}
+	public function setChunk(int $chunkX, int $chunkZ, Chunk $chunk) : void{
 		$this->chunks[World::chunkHash($chunkX, $chunkZ)] = $chunk;
 	}
 
diff --git a/src/world/World.php b/src/world/World.php
index 36c495f63..c82ac7f1d 100644
--- a/src/world/World.php
+++ b/src/world/World.php
@@ -2025,11 +2025,7 @@ class World implements ChunkManager{
 	/**
 	 * @param bool       $deleteEntitiesAndTiles Whether to delete entities and tiles on the old chunk, or transfer them to the new one
 	 */
-	public function setChunk(int $chunkX, int $chunkZ, ?Chunk $chunk, bool $deleteEntitiesAndTiles = true) : void{
-		if($chunk === null){
-			return;
-		}
-
+	public function setChunk(int $chunkX, int $chunkZ, Chunk $chunk, bool $deleteEntitiesAndTiles = true) : void{
 		$chunkHash = World::chunkHash($chunkX, $chunkZ);
 		$oldChunk = $this->loadChunk($chunkX, $chunkZ);
 		if($oldChunk !== null and $oldChunk !== $chunk){