diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftShulker.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftShulker.java
index 80bfa1bc5d..d25b742e75 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftShulker.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftShulker.java
@@ -35,8 +35,6 @@ public class CraftShulker extends CraftGolem implements Shulker {
 
     @Override
     public void setColor(DyeColor color) {
-        Preconditions.checkArgument(color != null, "color");
-
-        getHandle().getDataWatcher().set(EntityShulker.COLOR, color.getWoolData());
+        getHandle().getDataWatcher().set(EntityShulker.COLOR, (color == null) ? 16 : color.getWoolData());
     }
 }