diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/Entity.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/Entity.kt
index db0cd99fc..a8742e415 100644
--- a/src/main/java/de/bixilon/minosoft/data/entities/entities/Entity.kt
+++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/Entity.kt
@@ -213,7 +213,7 @@ abstract class Entity(
         val result = VoxelShape()
         for (blockPosition in blockPositions) {
             val chunk = connection.world.getChunk(blockPosition.chunkPosition)
-            if (chunk == null && !ignoreUnloadedChunks) {
+            if ((chunk == null || !chunk.isFullyLoaded) && !ignoreUnloadedChunks) {
                 // chunk is not loaded
                 result.add(VoxelShape.FULL + blockPosition)
                 continue
@@ -284,7 +284,7 @@ abstract class Entity(
             }
         }
         velocity?.let {
-            move(it * deltaTime)
+            move(it * deltaTime, false)
         }
     }