diff --git a/src/main/java/net/minestom/server/entity/Entity.java b/src/main/java/net/minestom/server/entity/Entity.java
index 0747e0f05..2ebc9a3ba 100644
--- a/src/main/java/net/minestom/server/entity/Entity.java
+++ b/src/main/java/net/minestom/server/entity/Entity.java
@@ -462,6 +462,11 @@ public class Entity implements Viewable, EventHandler, DataContainer, Permission
             return;
         }
 
+        // Fix current chunk being null if the entity has been spawned before
+        if (currentChunk == null) {
+            currentChunk = instance.getChunkAt(position);
+        }
+
         // Check if the entity chunk is loaded
         if (!ChunkUtils.isLoaded(currentChunk)) {
             // No update for entities in unloaded chunk