diff --git a/lib/towerops_web/live/agent_live/index.ex b/lib/towerops_web/live/agent_live/index.ex
index f67f5007..0937648a 100644
--- a/lib/towerops_web/live/agent_live/index.ex
+++ b/lib/towerops_web/live/agent_live/index.ex
@@ -27,21 +27,12 @@ defmodule ToweropsWeb.AgentLive.Index do
       end
 
     # device counts for each agent (both direct and total with inheritance)
-    equipment_counts =
-      Map.new(agent_tokens, fn token ->
-        direct = Agents.count_assigned_devices(token.id)
-        total = length(Agents.list_agent_polling_targets(token.id))
-        {token.id, %{direct: direct, total: total}}
-      end)
+    equipment_counts = calculate_device_counts(agent_tokens)
 
     # device counts for cloud pollers (if superuser)
     cloud_poller_counts =
       if is_superuser do
-        Map.new(cloud_pollers, fn token ->
-          direct = Agents.count_assigned_devices(token.id)
-          total = length(Agents.list_agent_polling_targets(token.id))
-          {token.id, %{direct: direct, total: total}}
-        end)
+        calculate_device_counts(cloud_pollers)
       else
         %{}
       end
@@ -179,7 +170,7 @@ defmodule ToweropsWeb.AgentLive.Index do
             {token.id, %{direct: direct, total: total}}
           end)
 
-        cloud_poller_counts = calculate_cloud_poller_counts(cloud_pollers)
+        cloud_poller_counts = calculate_device_counts(cloud_pollers)
 
         # Refresh health statistics
         agent_health_stats = Stats.get_organization_agent_health(organization.id)
@@ -282,7 +273,7 @@ defmodule ToweropsWeb.AgentLive.Index do
     cloud_pollers = load_cloud_pollers_if_superuser(socket.assigns.current_scope)
 
     equipment_counts = calculate_device_counts(agent_tokens)
-    cloud_poller_counts = calculate_cloud_poller_counts(cloud_pollers)
+    cloud_poller_counts = calculate_device_counts(cloud_pollers)
 
     agent_health_stats = Stats.get_organization_agent_health(organization.id)
     assignment_breakdown = Stats.get_device_assignment_breakdown(organization.id)
@@ -317,14 +308,6 @@ defmodule ToweropsWeb.AgentLive.Index do
     end)
   end
 
-  defp calculate_cloud_poller_counts(cloud_pollers) do
-    Map.new(cloud_pollers, fn t ->
-      direct = Agents.count_assigned_devices(t.id)
-      total = length(Agents.list_agent_polling_targets(t.id))
-      {t.id, %{direct: direct, total: total}}
-    end)
-  end
-
   defp get_success_message(is_cloud_poller) do
     if is_cloud_poller,
       do: t_equipment("Cloud poller created successfully"),