diff --git a/lib/towerops_web/channels/agent_channel.ex b/lib/towerops_web/channels/agent_channel.ex
index ef6ad0df..55b6231c 100644
--- a/lib/towerops_web/channels/agent_channel.ex
+++ b/lib/towerops_web/channels/agent_channel.ex
@@ -268,7 +268,7 @@ defmodule ToweropsWeb.AgentChannel do
 
       equipment ->
         # Verify equipment belongs to agent's organization
-        if equipment.organization_id == organization_id do
+        if equipment.site.organization_id == organization_id do
           case result.job_type do
             :DISCOVER -> process_discovery_result(equipment, result)
             :POLL -> process_polling_result(equipment, result)