diff --git a/src/main/java/net/minestom/server/entity/Player.java b/src/main/java/net/minestom/server/entity/Player.java
index db55890e2..7bc17d8cc 100644
--- a/src/main/java/net/minestom/server/entity/Player.java
+++ b/src/main/java/net/minestom/server/entity/Player.java
@@ -1631,7 +1631,9 @@ public class Player extends LivingEntity implements CommandSender {
 
     @Override
     public void teleport(@NotNull Position position, @Nullable Runnable callback) {
-        final long[] chunks = ChunkUtils.getChunksInRange(position, getChunkRange());
+        final boolean sameChunk = getPosition().inSameChunk(position);
+        final long[] chunks = sameChunk ? null :
+                ChunkUtils.getChunksInRange(position, getChunkRange());
         teleport(position, chunks, callback);
     }