diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/safelog/npc/NPCManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/safelog/npc/NPCManager.java
index 5998a312f..696c9592d 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/safelog/npc/NPCManager.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/safelog/npc/NPCManager.java
@@ -15,6 +15,7 @@ import org.bukkit.event.entity.EntityCombustEvent;
 import org.bukkit.event.entity.EntityDeathEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.world.ChunkUnloadEvent;
+import org.bukkit.metadata.FixedMetadataValue;
 
 import mineplex.core.MiniPlugin;
 import mineplex.core.hologram.HologramManager;
@@ -82,7 +83,7 @@ public class NPCManager extends MiniPlugin
 	{
 		for (LivingEntity entity : Spawn.getSpawnWorld().getLivingEntities())
 		{
-			if (entity.hasMetadata("CombatLogNPC"))
+			if (entity.hasMetadata("CombatLogNPC") && ((FixedMetadataValue) entity.getMetadata("CombatLogNPC").get(0)).asString().equals(event.getPlayer().getUniqueId().toString()))
 			{
 				entity.remove();
 			}