diff --git a/src/main/java/de/bixilon/minosoft/data/player/PlayerListItemBulk.java b/src/main/java/de/bixilon/minosoft/data/player/PlayerListItemBulk.java
index fe6d6e3d2..bea80ca5b 100644
--- a/src/main/java/de/bixilon/minosoft/data/player/PlayerListItemBulk.java
+++ b/src/main/java/de/bixilon/minosoft/data/player/PlayerListItemBulk.java
@@ -94,4 +94,9 @@ public class PlayerListItemBulk {
     public PacketPlayerListItem.PlayerListItemActions getAction() {
         return action;
     }
+
+    @Override
+    public String toString() {
+        return String.format("uuid=%s, action=%s, name=%s, gameMode=%s, ping=%d, displayName=%s", getUUID(), getAction(), getName(), getGameMode(), getPing(), getDisplayName());
+    }
 }
diff --git a/src/main/java/de/bixilon/minosoft/logging/Log.java b/src/main/java/de/bixilon/minosoft/logging/Log.java
index f4ca8fd52..fe576b77e 100644
--- a/src/main/java/de/bixilon/minosoft/logging/Log.java
+++ b/src/main/java/de/bixilon/minosoft/logging/Log.java
@@ -59,6 +59,9 @@ public class Log {
     }
 
     public static void log(LogLevels level, String prefix, String message, RGBColor color) {
+        if (message.isBlank()) {
+            return;
+        }
         if (level.ordinal() > Log.level.ordinal()) {
             // log level too low
             return;
diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketChangeGameState.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketChangeGameState.java
index daf2c0a88..e01d21332 100644
--- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketChangeGameState.java
+++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketChangeGameState.java
@@ -13,7 +13,6 @@
 
 package de.bixilon.minosoft.protocol.packets.clientbound.play;
 
-import de.bixilon.minosoft.data.GameModes;
 import de.bixilon.minosoft.data.MapSet;
 import de.bixilon.minosoft.data.VersionValueMap;
 import de.bixilon.minosoft.logging.Log;
@@ -39,12 +38,7 @@ public class PacketChangeGameState implements ClientboundPacket {
 
     @Override
     public void log() {
-        switch (getReason()) {
-            case START_RAIN -> Log.game("Received weather packet: Starting rain...");
-            case END_RAIN -> Log.game("Received weather packet: Stopping rain...");
-            case CHANGE_GAMEMODE -> Log.game(String.format("Received game mode change: Now in %s", GameModes.byId(getValue().intValue())));
-            default -> Log.protocol(String.format("Received game status change (%s)", getReason()));
-        }
+        Log.protocol(String.format("Received game status change (%s)", getReason()));
     }
 
     public Reason getReason() {
diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketDisconnect.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketDisconnect.java
index 6aa0417ae..206863f2b 100644
--- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketDisconnect.java
+++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketDisconnect.java
@@ -35,7 +35,7 @@ public class PacketDisconnect implements ClientboundPacket {
 
     @Override
     public void log() {
-        Log.game(String.format("Disconnected: %s", reason.getANSIColoredMessage()));
+        Log.protocol(String.format("Received disconnect packet (reason=\"%s\")", reason.getANSIColoredMessage()));
     }
 
     public ChatComponent getReason() {
diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketEntityEffect.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketEntityEffect.java
index de2a08d52..7ab076914 100644
--- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketEntityEffect.java
+++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketEntityEffect.java
@@ -57,7 +57,7 @@ public class PacketEntityEffect implements ClientboundPacket {
 
     @Override
     public void log() {
-        Log.game(String.format("Entity effect added: %d %s", entityId, effect.toString()));
+        Log.protocol(String.format("Entity effect added: %d %s", entityId, effect.toString()));
     }
 
     public int getEntityId() {
diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketPlayerListItem.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketPlayerListItem.java
index e2e4ca746..e4c443af8 100644
--- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketPlayerListItem.java
+++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketPlayerListItem.java
@@ -83,11 +83,7 @@ public class PacketPlayerListItem implements ClientboundPacket {
     @Override
     public void log() {
         for (PlayerListItemBulk property : playerList) {
-            if (property.isLegacy()) {
-                Log.game(String.format("[TAB] Player list item bulk (uuid=%s, name=%s, ping=%d)", property.getUUID(), property.getName(), property.getPing()));
-            } else {
-                Log.game(String.format("[TAB] Player list item bulk (uuid=%s, action=%s, name=%s, gameMode=%s, ping=%d, displayName=%s)", property.getUUID(), property.getAction(), property.getName(), property.getGameMode(), property.getPing(), property.getDisplayName()));
-            }
+            Log.protocol(String.format("Received player list item bulk (%s)", property));
         }
     }
 
diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketRemoveEntityEffect.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketRemoveEntityEffect.java
index 10c75008d..60c39ea89 100644
--- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketRemoveEntityEffect.java
+++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketRemoveEntityEffect.java
@@ -38,7 +38,7 @@ public class PacketRemoveEntityEffect implements ClientboundPacket {
 
     @Override
     public void log() {
-        Log.game(String.format("Entity effect removed (entityId=%d, effect=%s)", entityId, effect));
+        Log.protocol(String.format("Entity effect removed (entityId=%d, effect=%s)", entityId, effect));
     }
 
     public int getEntityId() {
diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketUpdateSignReceiving.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketUpdateSignReceiving.java
index 6b63b6604..61f5105d4 100644
--- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketUpdateSignReceiving.java
+++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketUpdateSignReceiving.java
@@ -44,7 +44,7 @@ public class PacketUpdateSignReceiving implements ClientboundPacket {
 
     @Override
     public void log() {
-        Log.game(String.format("Sign data received at: %s", position));
+        Log.protocol(String.format("Sign data received at: %s", position));
     }
 
     public BlockPosition getPosition() {
diff --git a/src/main/java/de/bixilon/minosoft/protocol/protocol/PacketHandler.java b/src/main/java/de/bixilon/minosoft/protocol/protocol/PacketHandler.java
index a5e75712d..086f680eb 100644
--- a/src/main/java/de/bixilon/minosoft/protocol/protocol/PacketHandler.java
+++ b/src/main/java/de/bixilon/minosoft/protocol/protocol/PacketHandler.java
@@ -266,6 +266,13 @@ public class PacketHandler {
             return;
         }
 
+        Log.game(switch (pkg.getReason()) {
+            case START_RAIN -> "Received weather packet: Starting rain...";
+            case END_RAIN -> "Received weather packet: Stopping rain...";
+            case CHANGE_GAMEMODE -> String.format("Received game mode change: Now in %s", GameModes.byId(pkg.getValue().intValue()));
+            default -> "";
+        });
+
         switch (pkg.getReason()) {
             case START_RAIN -> connection.getPlayer().getWorld().setRaining(true);
             case END_RAIN -> connection.getPlayer().getWorld().setRaining(false);