diff --git a/src/main/java/net/minestom/server/entity/Entity.java b/src/main/java/net/minestom/server/entity/Entity.java
index 4c19cb73f..1d1223240 100644
--- a/src/main/java/net/minestom/server/entity/Entity.java
+++ b/src/main/java/net/minestom/server/entity/Entity.java
@@ -143,10 +143,10 @@ public abstract class Entity implements Viewable, EventHandler, DataContainer, P
         this.lastY = spawnPosition.getY();
         this.lastZ = spawnPosition.getZ();
 
-        this.entityMeta = entityType.getMetaConstructor().apply(this, this.metadata);
-
         setBoundingBox(entityType.getWidth(), entityType.getHeight(), entityType.getWidth());
 
+        this.entityMeta = entityType.getMetaConstructor().apply(this, this.metadata);
+
         setAutoViewable(true);
 
         Entity.entityById.put(id, this);
diff --git a/src/main/java/net/minestom/server/entity/metadata/water/fish/PufferfishMeta.java b/src/main/java/net/minestom/server/entity/metadata/water/fish/PufferfishMeta.java
index d14bcbf6b..591ebe110 100644
--- a/src/main/java/net/minestom/server/entity/metadata/water/fish/PufferfishMeta.java
+++ b/src/main/java/net/minestom/server/entity/metadata/water/fish/PufferfishMeta.java
@@ -8,6 +8,7 @@ public class PufferfishMeta extends AbstractFishMeta {
 
     public PufferfishMeta(@NotNull Entity entity, @NotNull Metadata metadata) {
         super(entity, metadata);
+        updateBoundingBox(State.UNPUFFED);
     }
 
     public State getState() {