diff --git a/ui/src/api/queries/agents.ts b/ui/src/api/queries/agents.ts
index 710c7839..504156bd 100644
--- a/ui/src/api/queries/agents.ts
+++ b/ui/src/api/queries/agents.ts
@@ -19,15 +19,16 @@ export function useAgents(status?: string, application?: string) {
   });
 }
 
-export function useAgentEvents(appId?: string, agentId?: string, limit = 50) {
+export function useAgentEvents(appId?: string, agentId?: string, limit = 50, toOverride?: string) {
   const refetchInterval = useRefreshInterval(15_000);
   return useQuery({
-    queryKey: ['agents', 'events', appId, agentId, limit],
+    queryKey: ['agents', 'events', appId, agentId, limit, toOverride],
     queryFn: async () => {
       const token = useAuthStore.getState().accessToken;
       const params = new URLSearchParams();
       if (appId) params.set('appId', appId);
       if (agentId) params.set('agentId', agentId);
+      if (toOverride) params.set('to', toOverride);
       params.set('limit', String(limit));
       const res = await fetch(`${config.apiBaseUrl}/agents/events-log?${params}`, {
         headers: {
diff --git a/ui/src/api/queries/logs.ts b/ui/src/api/queries/logs.ts
index 7ece5dd7..c705ee73 100644
--- a/ui/src/api/queries/logs.ts
+++ b/ui/src/api/queries/logs.ts
@@ -16,20 +16,21 @@ export interface LogEntryResponse {
 export function useApplicationLogs(
   application?: string,
   agentId?: string,
-  options?: { limit?: number },
+  options?: { limit?: number; toOverride?: string },
 ) {
   const refetchInterval = useRefreshInterval(15_000);
   const { timeRange } = useGlobalFilters();
+  const to = options?.toOverride ?? timeRange.end.toISOString();
 
   return useQuery({
-    queryKey: ['logs', application, agentId, timeRange.start.toISOString(), timeRange.end.toISOString(), options?.limit],
+    queryKey: ['logs', application, agentId, timeRange.start.toISOString(), to, options?.limit],
     queryFn: async () => {
       const token = useAuthStore.getState().accessToken;
       const params = new URLSearchParams();
       params.set('application', application!);
       if (agentId) params.set('agentId', agentId);
       params.set('from', timeRange.start.toISOString());
-      params.set('to', timeRange.end.toISOString());
+      params.set('to', to);
       if (options?.limit) params.set('limit', String(options.limit));
       const res = await fetch(`${config.apiBaseUrl}/logs?${params}`, {
         headers: {
diff --git a/ui/src/pages/AgentHealth/AgentHealth.tsx b/ui/src/pages/AgentHealth/AgentHealth.tsx
index 2042d9aa..ae820768 100644
--- a/ui/src/pages/AgentHealth/AgentHealth.tsx
+++ b/ui/src/pages/AgentHealth/AgentHealth.tsx
@@ -223,8 +223,9 @@ function AgentPerformanceContent({ agent }: { agent: AgentInstance }) {
 export default function AgentHealth() {
   const { appId } = useParams();
   const { data: agents } = useAgents(undefined, appId);
-  const { data: events, refetch: refetchEvents } = useAgentEvents(appId);
   const [eventSortAsc, setEventSortAsc] = useState(false);
+  const [eventRefreshTo, setEventRefreshTo] = useState<string | undefined>();
+  const { data: events } = useAgentEvents(appId, undefined, 50, eventRefreshTo);
 
   const [selectedInstance, setSelectedInstance] = useState<AgentInstance | null>(null);
   const [panelOpen, setPanelOpen] = useState(false);
@@ -509,7 +510,7 @@ export default function AgentHealth() {
               <button className={styles.sortBtn} onClick={() => setEventSortAsc((v) => !v)} title={eventSortAsc ? 'Oldest first' : 'Newest first'}>
                 {eventSortAsc ? '\u2191' : '\u2193'}
               </button>
-              <button className={styles.refreshBtn} onClick={() => refetchEvents()} title="Refresh">
+              <button className={styles.refreshBtn} onClick={() => setEventRefreshTo(new Date().toISOString())} title="Refresh">
                 &#x21bb;
               </button>
             </div>
diff --git a/ui/src/pages/AgentInstance/AgentInstance.tsx b/ui/src/pages/AgentInstance/AgentInstance.tsx
index 09ff0946..f316a9af 100644
--- a/ui/src/pages/AgentInstance/AgentInstance.tsx
+++ b/ui/src/pages/AgentInstance/AgentInstance.tsx
@@ -35,11 +35,13 @@ export default function AgentInstance() {
   const [logLevels, setLogLevels] = useState<Set<string>>(new Set());
   const [logSortAsc, setLogSortAsc] = useState(false);
   const [eventSortAsc, setEventSortAsc] = useState(false);
+  const [logRefreshTo, setLogRefreshTo] = useState<string | undefined>();
+  const [eventRefreshTo, setEventRefreshTo] = useState<string | undefined>();
   const timeFrom = timeRange.start.toISOString();
   const timeTo = timeRange.end.toISOString();
 
   const { data: agents, isLoading } = useAgents(undefined, appId);
-  const { data: events, refetch: refetchEvents } = useAgentEvents(appId, instanceId);
+  const { data: events } = useAgentEvents(appId, instanceId, 50, eventRefreshTo);
   const { data: timeseries } = useStatsTimeseries(timeFrom, timeTo, undefined, appId);
 
   const agent = useMemo(
@@ -137,7 +139,7 @@ export default function AgentInstance() {
   );
 
   // Application logs from OpenSearch
-  const { data: rawLogs, refetch: refetchLogs } = useApplicationLogs(appId, instanceId);
+  const { data: rawLogs } = useApplicationLogs(appId, instanceId, { toOverride: logRefreshTo });
   const logEntries = useMemo<LogEntry[]>(() => {
     const mapped = (rawLogs || []).map((l) => ({
       timestamp: l.timestamp ?? '',
@@ -402,7 +404,7 @@ export default function AgentInstance() {
               <button className={styles.sortBtn} onClick={() => setLogSortAsc((v) => !v)} title={logSortAsc ? 'Oldest first' : 'Newest first'}>
                 {logSortAsc ? '\u2191' : '\u2193'}
               </button>
-              <button className={styles.refreshBtn} onClick={() => refetchLogs()} title="Refresh">
+              <button className={styles.refreshBtn} onClick={() => setLogRefreshTo(new Date().toISOString())} title="Refresh">
                 &#x21bb;
               </button>
             </div>
@@ -452,7 +454,7 @@ export default function AgentInstance() {
               <button className={styles.sortBtn} onClick={() => setEventSortAsc((v) => !v)} title={eventSortAsc ? 'Oldest first' : 'Newest first'}>
                 {eventSortAsc ? '\u2191' : '\u2193'}
               </button>
-              <button className={styles.refreshBtn} onClick={() => refetchEvents()} title="Refresh">
+              <button className={styles.refreshBtn} onClick={() => setEventRefreshTo(new Date().toISOString())} title="Refresh">
                 &#x21bb;
               </button>
             </div>