diff --git a/zone/attack.cpp b/zone/attack.cpp
index 3216b92d7..c2e85530f 100644
--- a/zone/attack.cpp
+++ b/zone/attack.cpp
@@ -1799,7 +1799,6 @@ bool Client::Death(Mob* killerMob, int32 damage, uint16 spell, EQ::skills::Skill
 	entity_list.RemoveFromTargets(this, true);
 	hate_list.RemoveEntFromHateList(this);
 	RemoveAutoXTargets();
-	ProcessXTargetAutoHaters();
 
 	//remove ourself from all proximities
 	ClearAllProximities();
diff --git a/zone/client.cpp b/zone/client.cpp
index 2bf75bf7f..abfa0e8e0 100644
--- a/zone/client.cpp
+++ b/zone/client.cpp
@@ -7426,9 +7426,7 @@ void Client::ProcessXTargetAutoHaters()
 	std::queue<int> empty_slots;
 	for (int i = 0; i < GetMaxXTargets(); ++i) {
 		if (XTargets[i].Type != Auto)
-			continue;
-
-		auto *mob = entity_list.GetMob(XTargets[i].ID);
+			continue;		
 
 		if (XTargets[i].ID != 0 && !GetXTargetAutoMgr()->contains_mob(XTargets[i].ID)) {
 			XTargets[i].ID = 0;
@@ -7436,12 +7434,6 @@ void Client::ProcessXTargetAutoHaters()
 			XTargets[i].dirty = true;
 		}
 
-		if (XTargets[i].ID != 0 && mob && !mob->IsValidXTarget()) {
-			XTargets[i].ID = 0;
-			XTargets[i].Name[0] = 0;
-			XTargets[i].dirty = true;
-		}
-
 		if (XTargets[i].ID == 0) {
 			empty_slots.push(i);
 			continue;