diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_8PacketFactory.java b/plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_8PacketFactory.java
index 324f7ae..567e1b8 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_8PacketFactory.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_8PacketFactory.java
@@ -187,13 +187,13 @@ public class V1_8PacketFactory implements PacketFactory {
             add(data, metadataFactory.creeperState(properties.getProperty(propertyRegistry.getByName("creeper_state", CreeperState.class))));
             add(data, metadataFactory.creeperCharged(properties.getProperty(propertyRegistry.getByName("creeper_charged", Boolean.class))));
         }
+
         if (properties.getProperty(propertyRegistry.getByName("dinnerbone", Boolean.class))) {
             add(data, metadataFactory.name(Component.text("Dinnerbone")));
-        } else {
-            if (properties.hasProperty(propertyRegistry.getByName("name"))) {
-                add(data, metadataFactory.name(PapiUtil.set(textSerializer, player, properties.getProperty(propertyRegistry.getByName("name", Component.class)))));
-                add(data, metadataFactory.nameShown());
-            }
+        }
+        else if (properties.hasProperty(propertyRegistry.getByName("name"))) {
+            add(data, metadataFactory.name(PapiUtil.set(textSerializer, player, properties.getProperty(propertyRegistry.getByName("name", Component.class)))));
+            add(data, metadataFactory.nameShown());
         }
         return data;
     }