diff --git a/Modules/AgentTracker.lua b/Modules/AgentTracker.lua
index b70a625..9338373 100644
--- a/Modules/AgentTracker.lua
+++ b/Modules/AgentTracker.lua
@@ -71,10 +71,17 @@ function shared.AgentTracker.Init()
 
 		local channelId = select(6, ...)
 		local _, channelname = GetChannelName(channelId)
-		if channelname ~= Heimdall_Data.config.agentTracker.masterChannel then
-			--			if Heimdall_Data.config.agentTracker.debug then
-			--				print(string.format("[%s] Ignoring message from non-master channel: %s", ModuleName, channelname))
-			--			end
+		local ok = false
+		for _, channel in pairs(Heimdall_Data.config.agentTracker.channels) do
+			if channel == channelname then
+				ok = true
+				break
+			end
+		end
+		if not ok then
+			if Heimdall_Data.config.agentTracker.debug then
+				print(string.format("[%s] Channel name does not match any of the channels", ModuleName))
+			end
 			return
 		end
 		if Heimdall_Data.config.agentTracker.debug then