diff --git a/lib/towerops_web/channels/agent_channel.ex b/lib/towerops_web/channels/agent_channel.ex
index 568829ca..8dd85260 100644
--- a/lib/towerops_web/channels/agent_channel.ex
+++ b/lib/towerops_web/channels/agent_channel.ex
@@ -914,7 +914,8 @@ defmodule ToweropsWeb.AgentChannel do
   defp process_polling_result(device, result, _socket) do
     snmp_device = device.snmp_device
     oid_values = Map.new(result.oid_values)
-    timestamp = DateTime.from_unix!(result.timestamp, :second)
+    # Use server time to avoid clock drift issues between agents
+    timestamp = DateTime.utc_now()
 
     Logger.info(
       "Processing polling result for #{device.name}: #{map_size(oid_values)} OIDs, #{length(snmp_device.sensors)} sensors, #{length(snmp_device.interfaces)} interfaces"