diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/LivingEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/LivingEntity.kt
index eb1beca9d..0e49e3d4f 100644
--- a/src/main/java/de/bixilon/minosoft/data/entities/entities/LivingEntity.kt
+++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/LivingEntity.kt
@@ -47,7 +47,7 @@ abstract class LivingEntity(connection: PlayConnection, entityType: EntityType,
 
 
     override val canRaycast: Boolean get() = super.canRaycast && health > 0.0
-    override val name: ChatComponent? get() = super.name ?: connection.language.translate(type.translationKey)
+    override val name: ChatComponent? get() = super.name
 
     private fun getLivingEntityFlag(bitMask: Int): Boolean {
         return data.getBitMask(FLAGS_DATA, bitMask, 0x00)
diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/text/name/EntityNameFeature.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/text/name/EntityNameFeature.kt
index 337bf38d4..7a08c51a6 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/text/name/EntityNameFeature.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/text/name/EntityNameFeature.kt
@@ -52,7 +52,11 @@ class EntityNameFeature(renderer: EntityRenderer<*>) : BillboardTextFeature(rend
 
     private fun Entity.getName(invisible: Boolean): ChatComponent? {
         if (invisible) return null
-        if (this.isNameVisible) return name
+        if (this.isNameVisible) {
+            var name = this.name
+            if (name == null && this is LivingEntity) name = connection.language.translate(type.translationKey) // TODO: Is that correct?
+            return name
+        }
         if (!isTargeted()) return null
         return name
     }