diff --git a/src/main/java/de/bixilon/minosoft/protocol/network/connection/play/channel/vanila/BrandHandler.kt b/src/main/java/de/bixilon/minosoft/protocol/network/connection/play/channel/vanila/BrandHandler.kt
index 79d96f2cf..947d38244 100644
--- a/src/main/java/de/bixilon/minosoft/protocol/network/connection/play/channel/vanila/BrandHandler.kt
+++ b/src/main/java/de/bixilon/minosoft/protocol/network/connection/play/channel/vanila/BrandHandler.kt
@@ -20,6 +20,7 @@ import de.bixilon.minosoft.protocol.ProtocolUtil.encodeNetwork
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
 import de.bixilon.minosoft.protocol.network.connection.play.channel.play.PlayChannelHandler
 import de.bixilon.minosoft.protocol.packets.c2s.common.ChannelC2SP
+import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition
 import de.bixilon.minosoft.protocol.protocol.buffers.play.PlayInByteBuffer
 import de.bixilon.minosoft.protocol.protocol.buffers.play.PlayOutByteBuffer
 
@@ -51,7 +52,7 @@ object BrandHandler {
     ) : PlayChannelHandler {
 
         override fun handle(buffer: PlayInByteBuffer) {
-            connection.serverInfo.brand = buffer.readString(buffer.bytesLeft)
+            connection.serverInfo.brand = buffer.readString(if (buffer.versionId < ProtocolDefinition.FLATTENING_VERSION) buffer.readVarInt() else buffer.bytesLeft)
         }
     }
 }