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 1c672b8bf..15584a2be 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
@@ -125,7 +125,7 @@ public class Entity implements GeyserEntity {
     @Setter(AccessLevel.NONE)
     private float boundingBoxWidth;
     @Setter(AccessLevel.NONE)
-    private String displayName;
+    protected String displayName;
     @Setter(AccessLevel.NONE)
     protected boolean silent = false;
     /* Metadata end */
diff --git a/core/src/main/java/org/geysermc/geyser/entity/type/player/AvatarEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/player/AvatarEntity.java
index 7239f23b2..f8bb7f658 100644
--- a/core/src/main/java/org/geysermc/geyser/entity/type/player/AvatarEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/type/player/AvatarEntity.java
@@ -269,13 +269,17 @@ public class AvatarEntity extends LivingEntity {
     @Override
     public void setDisplayName(EntityMetadata<Optional<Component>, ?> entityMetadata) {
         // Doesn't do anything for players
-        // TODO test mannequins
+        if (!(this instanceof PlayerEntity)) {
+            super.setDisplayName(entityMetadata);
+        }
     }
 
     @Override
     public void setDisplayNameVisible(BooleanEntityMetadata entityMetadata) {
         // Doesn't do anything for players
-        // TODO test mannequins
+        if (!(this instanceof PlayerEntity)) {
+            super.setDisplayNameVisible(entityMetadata);
+        }
     }
 
     public void setBelowNameText(String text) {
diff --git a/core/src/main/java/org/geysermc/geyser/entity/type/player/MannequinEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/player/MannequinEntity.java
index 29edbd623..c45221a1a 100644
--- a/core/src/main/java/org/geysermc/geyser/entity/type/player/MannequinEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/type/player/MannequinEntity.java
@@ -38,14 +38,19 @@ import java.util.UUID;
 public class MannequinEntity extends AvatarEntity {
 
     public MannequinEntity(GeyserSession session, int entityId, long geyserId, UUID uuid, EntityDefinition<?> definition, Vector3f position, Vector3f motion, float yaw, float pitch, float headYaw) {
-        super(session, entityId, geyserId, uuid, definition, position, motion, yaw, pitch, headYaw, "Mannequin"); // TODO from translation
+        super(session, entityId, geyserId, uuid, definition, position, motion, yaw, pitch, headYaw, "");
     }
 
     public void setProfile(EntityMetadata<ResolvableProfile, ?> entityMetadata) {
         setSkin(entityMetadata.getValue(), true, () -> {});
     }
 
-    public void setDescription(EntityMetadata<Optional<Component>, ?> entityMetadata) {
+    @Override
+    public String getDisplayName() {
+        return displayName;
+    }
 
+    public void setDescription(EntityMetadata<Optional<Component>, ?> entityMetadata) {
+        // TODO
     }
 }