diff --git a/src/main/java/noppes/npcs/controllers/ServerCloneController.java b/src/main/java/noppes/npcs/controllers/ServerCloneController.java
index bed456118..6aa99088f 100644
--- a/src/main/java/noppes/npcs/controllers/ServerCloneController.java
+++ b/src/main/java/noppes/npcs/controllers/ServerCloneController.java
@@ -149,6 +149,7 @@ public class ServerCloneController implements ICloneHandler {
 		if(!file.exists())
 			return false;
 		file.delete();
+		removeFromTagMap(name, tab);
 		return true;
 	}
 
@@ -175,6 +176,15 @@ public class ServerCloneController implements ICloneHandler {
 		return false;
 	}
 
+	public boolean removeFromTagMap(String name, int tab){
+		TagMap tagMap = ServerTagMapController.Instance.getTagMap(tab);
+		if(tagMap.removeClone(name)){
+			ServerTagMapController.Instance.saveTagMap(tagMap);
+			return true;
+		}
+		return false;
+	}
+
 	public void cleanTags(NBTTagCompound nbttagcompound){
 		if(nbttagcompound.hasKey("ItemGiverId"))
 			nbttagcompound.setInteger("ItemGiverId", 0);
diff --git a/src/main/java/noppes/npcs/controllers/data/TagMap.java b/src/main/java/noppes/npcs/controllers/data/TagMap.java
index 79ed50b78..dd4a1576d 100644
--- a/src/main/java/noppes/npcs/controllers/data/TagMap.java
+++ b/src/main/java/noppes/npcs/controllers/data/TagMap.java
@@ -77,8 +77,8 @@ public class TagMap {
 		return null;
 	}
 
-	public void removeClone(String cloneName) {
-		tagMap.remove(cloneName);
+	public boolean removeClone(String cloneName) {
+		return tagMap.remove(cloneName) != null;
 	}
 
 	public void putClone(String cloneName, HashSet<UUID> uuids) {