diff --git a/lib/towerops_web/channels/agent_channel.ex b/lib/towerops_web/channels/agent_channel.ex
index 5d605e37..751036e6 100644
--- a/lib/towerops_web/channels/agent_channel.ex
+++ b/lib/towerops_web/channels/agent_channel.ex
@@ -365,7 +365,7 @@ defmodule ToweropsWeb.AgentChannel do
       _ =
         Agents.update_agent_token_heartbeat(
           socket.assigns.agent_token_id,
-          heartbeat.ip_address,
+          get_remote_ip(socket),
           metadata
         )