diff --git a/src/main/java/com/owen1212055/customname/CustomNameManager.java b/src/main/java/com/owen1212055/customname/CustomNameManager.java
index 7242b0c..878370a 100644
--- a/src/main/java/com/owen1212055/customname/CustomNameManager.java
+++ b/src/main/java/com/owen1212055/customname/CustomNameManager.java
@@ -32,4 +32,12 @@ public CustomName forEntity(Entity entity) {
 
         return customName;
     }
+
+    public void unregister(Entity entity) {
+        CustomName customName = this.storage.remove(entity.getUniqueId());
+        if (customName != null) {
+            // Remove from trackers
+            customName.setHidden(true);
+        }
+    }
 }
diff --git a/src/main/java/com/owen1212055/customname/CustomNameStorage.java b/src/main/java/com/owen1212055/customname/CustomNameStorage.java
index c2ba93e..991efdd 100644
--- a/src/main/java/com/owen1212055/customname/CustomNameStorage.java
+++ b/src/main/java/com/owen1212055/customname/CustomNameStorage.java
@@ -19,10 +19,13 @@ public void registerNew(UUID entityId, CustomName name) {
         this.customPlayerNameMap.put(entityId, name);
     }
 
-    public void remove(UUID uuid) {
+    @Nullable
+    public CustomName remove(UUID uuid) {
         CustomName name = this.customPlayerNameMap.remove(uuid);
         if (name != null) {
             name.close();
         }
+
+        return name;
     }
 }