diff --git a/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/EntityPackets.java b/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/EntityPackets.java
index b7a8d9c04..50826eb0b 100644
--- a/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/EntityPackets.java
+++ b/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/EntityPackets.java
@@ -201,6 +201,16 @@ public class EntityPackets {
                         tracker.handleMetadata(entityID, metadataList);
                     }
                 });
+
+                // Cancel packet if list empty
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        List<Metadata> metadataList = wrapper.get(Protocol1_9TO1_8.METADATA_LIST, 0);
+                        if(metadataList.size() == 0)
+                            wrapper.cancel();
+                    }
+                });
             }
         });