diff --git a/src/main/java/org/bukkit/craftbukkit/CraftEffect.java b/src/main/java/org/bukkit/craftbukkit/CraftEffect.java
index c6edd7a507..8345587b5e 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftEffect.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftEffect.java
@@ -20,7 +20,7 @@ public class CraftEffect {
             datavalue = ((Potion) data).toDamageValue() & 0x3F;
             break;
         case RECORD_PLAY:
-            Validate.isTrue(((Material) data).isRecord(), "Invalid record type!");
+            Validate.isTrue(data == Material.AIR || ((Material) data).isRecord(), "Invalid record type!");
             datavalue = Item.getId(CraftMagicNumbers.getItem((Material) data));
             break;
         case SMOKE: