diff --git a/src/main/java/net/minestom/server/instance/DynamicChunk.java b/src/main/java/net/minestom/server/instance/DynamicChunk.java
index b57277d6c..f288d9312 100644
--- a/src/main/java/net/minestom/server/instance/DynamicChunk.java
+++ b/src/main/java/net/minestom/server/instance/DynamicChunk.java
@@ -142,8 +142,8 @@ public class DynamicChunk extends Chunk {
                 this.cachedPacketTime = lastChange;
             }
             NettyPlayerConnection nettyPlayerConnection = (NettyPlayerConnection) connection;
-            nettyPlayerConnection.write(chunkPacket);
             nettyPlayerConnection.write(lightPacket);
+            nettyPlayerConnection.write(chunkPacket);
         } else {
             connection.sendPacket(createLightPacket());
             connection.sendPacket(createChunkPacket());
diff --git a/src/main/java/net/minestom/server/network/player/NettyPlayerConnection.java b/src/main/java/net/minestom/server/network/player/NettyPlayerConnection.java
index 6399887e5..c226bb2c3 100644
--- a/src/main/java/net/minestom/server/network/player/NettyPlayerConnection.java
+++ b/src/main/java/net/minestom/server/network/player/NettyPlayerConnection.java
@@ -198,7 +198,7 @@ public class NettyPlayerConnection extends PlayerConnection {
     public void write(@NotNull ByteBuffer buffer) {
         synchronized (tickBuffer) {
             buffer.flip();
-            if (buffer.remaining() > tickBuffer.remaining()) {
+            if (buffer.limit() > tickBuffer.remaining()) {
                 // Tick buffer is full, flush before appending
                 flush();
             }