diff --git a/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/Npc_1_21_11.java b/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/Npc_1_21_11.java
index 94a385bb8..0e78b3748 100644
--- a/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/Npc_1_21_11.java
+++ b/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/Npc_1_21_11.java
@@ -260,13 +260,16 @@ public void update(Player player, boolean swingArm) {
         }
 
         if (data.getDisplayName().equalsIgnoreCase("<empty>")) {
+            Component empty = Component.empty();
+            team.setPlayerPrefix(empty);
+            npcPlayer.listName = empty;
             team.setNameTagVisibility(Team.Visibility.NEVER);
-            npc.setCustomName(null);
-            npc.setCustomNameVisible(false);
         } else {
-            team.setNameTagVisibility(Team.Visibility.ALWAYS);
+            team.setPlayerPrefix(vanillaComponent);
+            npcPlayer.listName = vanillaComponent;
         }
 
+
         if (npc instanceof ServerPlayer npcPlayer) {
             team.setPlayerPrefix(vanillaComponent);
             npcPlayer.listName = vanillaComponent;