diff --git a/ui/src/pages/AgentHealth/AgentHealth.tsx b/ui/src/pages/AgentHealth/AgentHealth.tsx
index dbc2775c..674d375b 100644
--- a/ui/src/pages/AgentHealth/AgentHealth.tsx
+++ b/ui/src/pages/AgentHealth/AgentHealth.tsx
@@ -966,7 +966,7 @@ export default function AgentHealth() {
             maxHeight={360}
           >
             {filteredLogs.length > 0 ? (
-              <LogViewer entries={filteredLogs} />
+              <LogViewer entries={filteredLogs} className={logStyles.flatScroll} />
             ) : (
               <div className={logStyles.logEmpty}>
                 {logSearch || logLevels.size > 0 || logSources.size > 0
@@ -1004,7 +1004,7 @@ export default function AgentHealth() {
             maxHeight={360}
           >
             {feedEvents.length > 0 ? (
-              <EventFeed events={feedEvents} />
+              <EventFeed events={feedEvents} className={logStyles.flatScroll} />
             ) : (
               <div className={logStyles.logEmpty}>
                 {eventStream.isLoading ? 'Loading events\u2026' : 'No events in the selected time range.'}
diff --git a/ui/src/pages/AgentInstance/AgentInstance.tsx b/ui/src/pages/AgentInstance/AgentInstance.tsx
index 87a4fdc4..ca53c900 100644
--- a/ui/src/pages/AgentInstance/AgentInstance.tsx
+++ b/ui/src/pages/AgentInstance/AgentInstance.tsx
@@ -472,7 +472,7 @@ export default function AgentInstance() {
             maxHeight={360}
           >
             {filteredLogs.length > 0 ? (
-              <LogViewer entries={filteredLogs} />
+              <LogViewer entries={filteredLogs} className={logStyles.flatScroll} />
             ) : (
               <div className={logStyles.logEmpty}>
                 {logSearch || logLevels.size > 0 || logSources.size > 0
@@ -510,7 +510,7 @@ export default function AgentInstance() {
             maxHeight={360}
           >
             {feedEvents.length > 0 ? (
-              <EventFeed events={feedEvents} />
+              <EventFeed events={feedEvents} className={logStyles.flatScroll} />
             ) : (
               <div className={logStyles.logEmpty}>
                 {eventStream.isLoading ? 'Loading events…' : 'No events in the selected time range.'}
diff --git a/ui/src/styles/log-panel.module.css b/ui/src/styles/log-panel.module.css
index 4bc2b69f..ddcc114e 100644
--- a/ui/src/styles/log-panel.module.css
+++ b/ui/src/styles/log-panel.module.css
@@ -9,6 +9,16 @@
   max-height: 420px;
 }
 
+/*
+ * Flatten the internal scroll of @cameleer/design-system's LogViewer and
+ * EventFeed so their containing InfiniteScrollArea owns the scroll — one
+ * scrollbar per panel, IntersectionObserver sentinels stay meaningful.
+ */
+.flatScroll {
+  overflow: visible !important;
+  max-height: none !important;
+}
+
 .logHeader {
   display: flex;
   align-items: center;