diff --git a/src/main/java/me/youhavetrouble/notjustnameplates/nameplates/NameplateManager.java b/src/main/java/me/youhavetrouble/notjustnameplates/nameplates/NameplateManager.java
index b4d8f0c..8b3b5f8 100644
--- a/src/main/java/me/youhavetrouble/notjustnameplates/nameplates/NameplateManager.java
+++ b/src/main/java/me/youhavetrouble/notjustnameplates/nameplates/NameplateManager.java
@@ -30,7 +30,10 @@ public class NameplateManager implements Listener {
         // Remove all orphan nameplates
         Bukkit.getScheduler().runTaskTimer(plugin, () -> Bukkit.getWorlds().forEach(world -> world.getEntities().forEach(entity -> {
             if (!(entity instanceof TextDisplay textDisplay)) return;
-            if (textDisplay.getPersistentDataContainer().has(Nameplate.NAMEPLATE_KEY)) return;
+            if (!textDisplay.getPersistentDataContainer().has(Nameplate.NAMEPLATE_KEY)) return;
+            for (Nameplate nameplate : nameplates.values()) {
+                if (nameplate.getEntity() == textDisplay) return;
+            }
             textDisplay.remove();
         })), 100, 100);
     }