diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/TabListDataS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/TabListDataS2CP.kt
index 9112d64ee..6c87a48fa 100644
--- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/TabListDataS2CP.kt
+++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/TabListDataS2CP.kt
@@ -165,16 +165,15 @@ class TabListDataS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket() {
                 item
             } ?: continue
 
-            if (entity == null || entity !is PlayerEntity) {
-                continue
-            }
-
             if (entity === connection.player) {
                 entity.tabListItem.specialMerge(data)
             } else {
                 tabListItem.merge(data)
             }
-
+            
+            if (entity == null || entity !is PlayerEntity) {
+                continue
+            }
 
             entity.tabListItem = tabListItem
         }