diff --git a/common/src/main/java/coffee/waffle/emcutils/feature/Nameplates.java b/common/src/main/java/coffee/waffle/emcutils/feature/Nameplates.java
index e5ee480..b2137e9 100644
--- a/common/src/main/java/coffee/waffle/emcutils/feature/Nameplates.java
+++ b/common/src/main/java/coffee/waffle/emcutils/feature/Nameplates.java
@@ -20,7 +20,7 @@ public static PlayerListEntry findPlayerListEntry(PlayerEntity player) {
 		PlayerListEntry entry = null;
 		for (PlayerListEntry playerListEntry : playerList) {
 			List<Text> siblings = playerListEntry.getDisplayName().getSiblings();
-			if (siblings.size() > 1 && siblings.get(1).contains(player.getName())) {
+			if (siblings.getFirst().contains(player.getName())) {
 				entry = playerListEntry;
 			}
 		}
@@ -30,7 +30,6 @@ public static PlayerListEntry findPlayerListEntry(PlayerEntity player) {
 
 	public static MutableText parseDisplayName(PlayerListEntry entry) {
 		List<Text> siblings = Lists.newArrayList(Objects.requireNonNull(entry.getDisplayName()).getSiblings());
-		siblings.remove(0); // Remove Server Tag
 
 		MutableText text = Text.empty();
 		for (Text sibling : siblings) {