diff --git a/bukkit/src/main/java/com/github/juliarn/npclib/bukkit/protocol/PacketEventsPacketAdapter.java b/bukkit/src/main/java/com/github/juliarn/npclib/bukkit/protocol/PacketEventsPacketAdapter.java
index 94d245c..6cb5451 100644
--- a/bukkit/src/main/java/com/github/juliarn/npclib/bukkit/protocol/PacketEventsPacketAdapter.java
+++ b/bukkit/src/main/java/com/github/juliarn/npclib/bukkit/protocol/PacketEventsPacketAdapter.java
@@ -543,7 +543,7 @@ private static final class Lazy {
                   if (component.rawMessage() != null) {
                     return AdventureSerializer.fromLegacyFormat(component.rawMessage());
                   } else {
-                    return AdventureSerializer.getGsonSerializer().deserializeOrNull(component.encodedJsonMessage());
+                    return AdventureSerializer.parseComponent(component.encodedJsonMessage());
                   }
                 }));
             } else {
@@ -562,7 +562,7 @@ private static final class Lazy {
         .put(Float.class, EntityDataTypes.FLOAT)
         .put(Boolean.class, EntityDataTypes.BOOLEAN)
         .put(String.class, EntityDataTypes.STRING)
-        .put(OPTIONAL_CHAT_COMPONENT_TYPE, EntityDataTypes.OPTIONAL_COMPONENT)
+        .put(OPTIONAL_CHAT_COMPONENT_TYPE, EntityDataTypes.OPTIONAL_ADV_COMPONENT)
         .put(com.github.retrooper.packetevents.protocol.entity.pose.EntityPose.class, EntityDataTypes.ENTITY_POSE)
         .build();
     }