diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/tab/TabListS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/tab/TabListS2CP.kt
index 0f52dfb80..2f84fe5cc 100644
--- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/tab/TabListS2CP.kt
+++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/tab/TabListS2CP.kt
@@ -43,7 +43,7 @@ class TabListS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket {
                 TabListItemActions.ADD -> {
                     val name = buffer.readString()
                     val properties = buffer.readPlayerProperties()
-                    val gamemode = Gamemodes[buffer.readVarInt()]
+                    val gamemode = Gamemodes.getOrNull(buffer.readVarInt()) ?: Gamemodes.SURVIVAL
                     val ping = buffer.readVarInt()
                     val hasDisplayName = buffer.readBoolean()
                     val displayName = if (hasDisplayName) {