diff --git a/zone/bot.cpp b/zone/bot.cpp
index 0ea24cef5..b632accf4 100644
--- a/zone/bot.cpp
+++ b/zone/bot.cpp
@@ -2086,6 +2086,13 @@ void Bot::AI_Process()
 		}
 	}
 
+	SetFollowID(follow_mob->GetID());
+
+		if (!follow_mob || !IsInGroupOrRaid(follow_mob)) {
+			follow_mob = leash_owner;
+		}
+	}
+
 	SetFollowID(follow_mob->GetID());
 
 	SetBerserkState();
@@ -2126,6 +2133,7 @@ void Bot::AI_Process()
 	glm::vec3 Goal(0, 0, 0);
 
 
+
 	// We have aggro to choose from
 	if (IsEngaged()) {
 		if (rest_timer.Enabled()) {
@@ -2332,6 +2340,11 @@ void Bot::AI_Process()
 			}
 		}
 
+				if (!TargetValidation(tar)) { return; }
+
+			}
+		}
+
 // ENGAGED NOT AT COMBAT RANGE
 
 		else if (!TryPursueTarget(leash_distance, Goal)) {