diff --git a/src/main/java/org/bukkit/craftbukkit/map/CraftMapView.java b/src/main/java/org/bukkit/craftbukkit/map/CraftMapView.java
index b28d6a3439..1a150d98b5 100644
--- a/src/main/java/org/bukkit/craftbukkit/map/CraftMapView.java
+++ b/src/main/java/org/bukkit/craftbukkit/map/CraftMapView.java
@@ -147,7 +147,9 @@ public final class CraftMapView implements MapView {
 
             byte[] buf = canvas.getBuffer();
             for (int i = 0; i < buf.length; ++i) {
-                if (buf[i] >= 0) render.buffer[i] = buf[i];
+                byte color = buf[i];
+                // There are 143 valid color id's, 0 -> 127 and -128 -> -113
+                if (color >= 0 || color <= -113) render.buffer[i] = color;
             }
 
             for (int i = 0; i < canvas.getCursors().size(); ++i) {