diff --git a/src/main/java/com/gmail/nossr50/listeners/EntityListener.java b/src/main/java/com/gmail/nossr50/listeners/EntityListener.java
index fb29207fc..09e41bc88 100644
--- a/src/main/java/com/gmail/nossr50/listeners/EntityListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/EntityListener.java
@@ -395,6 +395,10 @@ public class EntityListener implements Listener {
             entity.setCustomNameVisible(entity.getMetadata(mcMMO.customVisibleKey).get(0).asBoolean());
             entity.removeMetadata(mcMMO.customVisibleKey, plugin);
         }
+
+        if (entity.hasMetadata(mcMMO.entityMetadataKey)) {
+            entity.removeMetadata(mcMMO.entityMetadataKey, plugin);
+        }
     }
 
     /**