diff --git a/Spigot-API-Patches/Remove-Invalidated-Metadata.patch b/Spigot-API-Patches/Remove-Invalidated-Metadata.patch
new file mode 100644
index 0000000000..d6020e6ad4
--- /dev/null
+++ b/Spigot-API-Patches/Remove-Invalidated-Metadata.patch
@@ -0,0 +1,21 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Tue, 16 Jul 2013 21:26:50 -0400
+Subject: [PATCH] Remove Invalidated Metadata
+
+On reload, metadata will be cleared
+
+diff --git a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
++++ b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
+@@ -0,0 +0,0 @@ public abstract class MetadataStoreBase<T> {
+         Validate.notNull(owningPlugin, "Plugin cannot be null");
+         for (Map<Plugin, MetadataValue> values : metadataMap.values()) {
+             if (values.containsKey(owningPlugin)) {
+-                values.get(owningPlugin).invalidate();
++                values.remove(owningPlugin); // Paper - Remove bad metadata, invalidate() is not implemented
+             }
+         }
+     }
+--
\ No newline at end of file