1 files changed, 3 insertions, 0 deletions
diff --git a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
index 3a40ae7d..9bbe3647 100644
--- a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
+++ b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
@@ -86,6 +86,9 @@ public abstract class MetadataStoreBase<T> {
         for (int i = 0; i < metadataList.size(); i++) {
             if (metadataList.get(i).getOwningPlugin().equals(owningPlugin)) {
                 metadataList.remove(i);
+                if (metadataList.isEmpty()) {
+                    metadataMap.remove(key);
+                }
             }
         }
     }