diff --git a/proxy/src/main/java/com/velocitypowered/proxy/connection/MinecraftConnection.java b/proxy/src/main/java/com/velocitypowered/proxy/connection/MinecraftConnection.java
index c3212d09e..70de89673 100644
--- a/proxy/src/main/java/com/velocitypowered/proxy/connection/MinecraftConnection.java
+++ b/proxy/src/main/java/com/velocitypowered/proxy/connection/MinecraftConnection.java
@@ -157,12 +157,12 @@ public class MinecraftConnection extends ChannelInboundHandlerAdapter {
           logger.error("{}: read timed out", association);
         } else {
           boolean isQuietDecoderException = cause instanceof QuietDecoderException;
-          boolean willLogQuietDecoderException = isQuietDecoderException
-              && !(sessionHandler instanceof LoginSessionHandler)
-              && !(sessionHandler instanceof HandshakeSessionHandler);
+          boolean willLogQuietDecoderException = !isQuietDecoderException
+              || (!(sessionHandler instanceof LoginSessionHandler)
+              && !(sessionHandler instanceof HandshakeSessionHandler));
           if (willLogQuietDecoderException) {
             logger.error("{}: exception encountered in {}", association, sessionHandler, cause);
-          } else if (isQuietDecoderException) {
+          } else {
             knownDisconnect = true;
           }
         }
diff --git a/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/PlayerListItem.java b/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/PlayerListItem.java
index d0717bf43..c21a513e9 100644
--- a/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/PlayerListItem.java
+++ b/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/PlayerListItem.java
@@ -58,7 +58,7 @@ public class PlayerListItem implements MinecraftPacket {
             item.setProperties(ProtocolUtils.readProperties(buf));
             item.setGameMode(ProtocolUtils.readVarInt(buf));
             item.setLatency(ProtocolUtils.readVarInt(buf));
-            item.setDisplayName(readOptionalComponent(buf));
+            item.setDisplayName(readOptionalComponent(buf, version));
             break;
           case UPDATE_GAMEMODE:
             item.setGameMode(ProtocolUtils.readVarInt(buf));
@@ -67,7 +67,7 @@ public class PlayerListItem implements MinecraftPacket {
             item.setLatency(ProtocolUtils.readVarInt(buf));
             break;
           case UPDATE_DISPLAY_NAME:
-            item.setDisplayName(readOptionalComponent(buf));
+            item.setDisplayName(readOptionalComponent(buf, version));
             break;
           case REMOVE_PLAYER:
             //Do nothing, all that is needed is the uuid
@@ -85,9 +85,10 @@ public class PlayerListItem implements MinecraftPacket {
     }
   }
 
-  private static @Nullable Component readOptionalComponent(ByteBuf buf) {
+  private static @Nullable Component readOptionalComponent(ByteBuf buf, ProtocolVersion version) {
     if (buf.readBoolean()) {
-      return GsonComponentSerializer.gson().deserialize(ProtocolUtils.readString(buf));
+      return ProtocolUtils.getJsonChatSerializer(version)
+          .deserialize(ProtocolUtils.readString(buf));
     }
     return null;
   }