diff --git a/test/towerops_web/channels/agent_channel_test.exs b/test/towerops_web/channels/agent_channel_test.exs
index 1d59e1ed..e55b9f71 100644
--- a/test/towerops_web/channels/agent_channel_test.exs
+++ b/test/towerops_web/channels/agent_channel_test.exs
@@ -1013,8 +1013,13 @@ defmodule ToweropsWeb.AgentChannelTest do
 
       assert updated_device.status == :up
 
-      # Verify device_down alert was auto-resolved
-      updated_alert = Towerops.Alerts.get_alert(alert.id)
+      # Verify device_down alert was auto-resolved (poll for it since it happens asynchronously)
+      updated_alert =
+        poll_until(fn ->
+          alert = Towerops.Alerts.get_alert(alert.id)
+          if alert && alert.resolved_at, do: alert
+        end)
+
       assert updated_alert.resolved_at
 
       # Verify device_up alert was created