diff --git a/core/src/main/java/org/geysermc/geyser/entity/type/Entity.java b/core/src/main/java/org/geysermc/geyser/entity/type/Entity.java
index 0d3214709..c986a8067 100644
--- a/core/src/main/java/org/geysermc/geyser/entity/type/Entity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/type/Entity.java
@@ -176,6 +176,7 @@ public class Entity implements GeyserEntity {
         setFlag(EntityFlag.HAS_COLLISION, true);
         setFlag(EntityFlag.CAN_SHOW_NAME, true);
         setFlag(EntityFlag.CAN_CLIMB, true);
+        setFlag(EntityFlag.HIDDEN_WHEN_INVISIBLE, true);
         // Let the Java server (or us) supply all sounds for an entity
         setClientSideSilent();
     }
diff --git a/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/CreakingEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/CreakingEntity.java
index 1b9fdd8a4..166cdc053 100644
--- a/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/CreakingEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/CreakingEntity.java
@@ -53,7 +53,6 @@ public class CreakingEntity extends MonsterEntity {
     @Override
     protected void initializeMetadata() {
         super.initializeMetadata();
-        setFlag(EntityFlag.HIDDEN_WHEN_INVISIBLE, true);
         setFlag(EntityFlag.FIRE_IMMUNE, true);
     }