diff --git a/connector/src/main/java/org/geysermc/connector/utils/MapColor.java b/connector/src/main/java/org/geysermc/connector/utils/MapColor.java
index 2c4a13b9f..2db144648 100644
--- a/connector/src/main/java/org/geysermc/connector/utils/MapColor.java
+++ b/connector/src/main/java/org/geysermc/connector/utils/MapColor.java
@@ -227,7 +227,7 @@ public enum MapColor {
     }
 
     public static MapColor fromId(int id) {
-        return Arrays.stream(values()).filter(color -> color.getId() == id).findFirst().get();
+        return Arrays.stream(values()).filter(color -> color.getId() == id).findFirst().orElse(COLOR_0);
     }
 
     public int toARGB() {