diff --git a/zone/entity.cpp b/zone/entity.cpp
index b34f62d3d..317663927 100644
--- a/zone/entity.cpp
+++ b/zone/entity.cpp
@@ -2233,44 +2233,27 @@ Raid* EntityList::GetRaidByClient(Client* client)
 }
 Raid* EntityList::GetRaidByBotName(const char* name)
 {
-	std::list<RaidMember> rm;
-	auto GetMembersWithNames = [&rm](Raid const* r) -> std::list<RaidMember> {
-		for (const auto& m : r->members) {
-			if (strlen(m.member_name) > 0)
-				rm.push_back(m);
-		}
-		return rm;
-	};
-
 	for (const auto& r : raid_list) {
-		for (const auto& m : GetMembersWithNames(r)) {
-			if (strcmp(m.member_name, name) == 0) {
+		for (const auto& m : r->members) {
+			if (m.is_bot && strcmp(m.member_name, name) == 0) {
 				return r;
 			}
 		}
 	}
+	
 	return nullptr;
 }
 
 Raid* EntityList::GetRaidByBot(const Bot* bot)
 {
-	std::list<RaidMember> rm;
-	auto GetMembersWhoAreBots = [&rm](Raid* r) -> std::list<RaidMember> {
-		for (auto const& m : r->members) {
-			if (m.is_bot) {
-				rm.push_back(m);
-			}
-		}
-		return rm;
-	};
-
 	for (const auto& r : raid_list) {
-		for (const auto& m : GetMembersWhoAreBots(r)) {
-			if (m.member->CastToBot() == bot) {
+		for (const auto& m : r->members) {
+			if (m.is_bot && m.member->CastToBot() == bot) {
 				return r;
 			}
 		}
 	}
+
 	return nullptr;
 }