diff --git a/public/app/features/explore/TraceView/TraceView.tsx b/public/app/features/explore/TraceView/TraceView.tsx
index 8b6f5e07247..4f93f022dce 100644
--- a/public/app/features/explore/TraceView/TraceView.tsx
+++ b/public/app/features/explore/TraceView/TraceView.tsx
@@ -121,7 +121,6 @@ export function TraceView(props: Props) {
       childrenHiddenIDs,
       detailStates,
       hoverIndentGuideIds,
-      shouldScrollToFirstUiFindMatch: false,
       spanNameColumnWidth,
       traceID: props.traceProp?.traceID,
     }),
@@ -191,7 +190,6 @@ export function TraceView(props: Props) {
           )}
           <TraceTimelineViewer
             registerAccessors={noop}
-            scrollToFirstVisibleSpan={noop}
             findMatchesIDs={config.featureToggles.newTraceViewHeader ? spanFilterMatches : spanFindMatches}
             trace={traceProp}
             datasourceType={datasourceType}
@@ -207,7 +205,6 @@ export function TraceView(props: Props) {
             expandAll={expandAll}
             expandOne={expandOne}
             childrenToggle={childrenToggle}
-            clearShouldScrollToFirstUiFindMatch={noop}
             detailLogItemToggle={detailLogItemToggle}
             detailLogsToggle={detailLogsToggle}
             detailWarningsToggle={detailWarningsToggle}
diff --git a/public/app/features/explore/TraceView/components/TraceTimelineViewer/VirtualizedTraceView.test.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/VirtualizedTraceView.test.tsx
index 3fdbbc1d519..94019a615a4 100644
--- a/public/app/features/explore/TraceView/components/TraceTimelineViewer/VirtualizedTraceView.test.tsx
+++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/VirtualizedTraceView.test.tsx
@@ -29,7 +29,6 @@ const topOfExploreViewRef = jest.fn();
 let props = {
   childrenHiddenIDs: new Set(),
   childrenToggle: jest.fn(),
-  clearShouldScrollToFirstUiFindMatch: jest.fn(),
   currentViewRangeTime: [0.25, 0.75],
   detailLogItemToggle: jest.fn(),
   detailLogsToggle: jest.fn(),
@@ -39,10 +38,8 @@ let props = {
   detailToggle: jest.fn(),
   findMatchesIDs: null,
   registerAccessors: jest.fn(),
-  scrollToFirstVisibleSpan: jest.fn(),
   setSpanNameColumnWidth: jest.fn(),
   setTrace: jest.fn(),
-  shouldScrollToFirstUiFindMatch: false,
   spanNameColumnWidth: 0.5,
   trace,
   uiFind: 'uiFind',
diff --git a/public/app/features/explore/TraceView/components/TraceTimelineViewer/VirtualizedTraceView.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/VirtualizedTraceView.tsx
index 179c9d69b4d..5ae53b75f27 100644
--- a/public/app/features/explore/TraceView/components/TraceTimelineViewer/VirtualizedTraceView.tsx
+++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/VirtualizedTraceView.tsx
@@ -87,13 +87,11 @@ type TVirtualizedTraceViewOwnProps = {
   currentViewRangeTime: [number, number];
   timeZone: TimeZone;
   findMatchesIDs: Set<string> | TNil;
-  scrollToFirstVisibleSpan: () => void;
   registerAccessors: (accesors: Accessors) => void;
   trace: Trace;
   spanBarOptions: SpanBarOptions | undefined;
   linksGetter: (span: TraceSpan, items: TraceKeyValuePair[], itemIndex: number) => TraceLink[];
   childrenToggle: (spanID: string) => void;
-  clearShouldScrollToFirstUiFindMatch: () => void;
   detailLogItemToggle: (spanID: string, log: TraceLog) => void;
   detailLogsToggle: (spanID: string) => void;
   detailWarningsToggle: (spanID: string) => void;
@@ -224,14 +222,7 @@ export class UnthemedVirtualizedTraceView extends React.Component<VirtualizedTra
     let key: keyof VirtualizedTraceViewProps;
     for (key in nextProps) {
       if (nextProps[key] !== this.props[key]) {
-        // Unless the only change was props.shouldScrollToFirstUiFindMatch changing to false.
-        if (key === 'shouldScrollToFirstUiFindMatch') {
-          if (nextProps[key]) {
-            return true;
-          }
-        } else {
-          return true;
-        }
+        return true;
       }
     }
     return false;
@@ -240,9 +231,6 @@ export class UnthemedVirtualizedTraceView extends React.Component<VirtualizedTra
   componentDidUpdate(prevProps: Readonly<VirtualizedTraceViewProps>) {
     const { registerAccessors, trace, headerHeight } = prevProps;
     const {
-      shouldScrollToFirstUiFindMatch,
-      clearShouldScrollToFirstUiFindMatch,
-      scrollToFirstVisibleSpan,
       registerAccessors: nextRegisterAccessors,
       setTrace,
       trace: nextTrace,
@@ -259,11 +247,6 @@ export class UnthemedVirtualizedTraceView extends React.Component<VirtualizedTra
       nextRegisterAccessors(this.getAccessors());
     }
 
-    if (shouldScrollToFirstUiFindMatch) {
-      scrollToFirstVisibleSpan();
-      clearShouldScrollToFirstUiFindMatch();
-    }
-
     if (focusedSpanId !== prevProps.focusedSpanId) {
       this.scrollToSpan(headerHeight, focusedSpanId);
     }
diff --git a/public/app/features/explore/TraceView/components/TraceTimelineViewer/index.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/index.tsx
index eae81d2f1f9..031b9f95335 100644
--- a/public/app/features/explore/TraceView/components/TraceTimelineViewer/index.tsx
+++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/index.tsx
@@ -74,7 +74,6 @@ const getStyles = stylesFactory((theme: GrafanaTheme2) => {
 export type TProps = TExtractUiFindFromStateReturn & {
   registerAccessors: (accessors: Accessors) => void;
   findMatchesIDs: Set<string> | TNil;
-  scrollToFirstVisibleSpan: () => void;
   traceTimeline: TTraceTimeline;
   trace: Trace;
   datasourceType: string;
@@ -91,7 +90,6 @@ export type TProps = TExtractUiFindFromStateReturn & {
   expandOne: (spans: TraceSpan[]) => void;
 
   childrenToggle: (spanID: string) => void;
-  clearShouldScrollToFirstUiFindMatch: () => void;
   detailLogItemToggle: (spanID: string, log: TraceLog) => void;
   detailLogsToggle: (spanID: string) => void;
   detailWarningsToggle: (spanID: string) => void;
diff --git a/public/app/features/explore/TraceView/components/types/TTraceTimeline.tsx b/public/app/features/explore/TraceView/components/types/TTraceTimeline.tsx
index 2441cc05af5..38c6900b674 100644
--- a/public/app/features/explore/TraceView/components/types/TTraceTimeline.tsx
+++ b/public/app/features/explore/TraceView/components/types/TTraceTimeline.tsx
@@ -20,7 +20,6 @@ type TTraceTimeline = {
   childrenHiddenIDs: Set<string>;
   detailStates: Map<string, DetailState>;
   hoverIndentGuideIds: Set<string>;
-  shouldScrollToFirstUiFindMatch: boolean;
   spanNameColumnWidth: number;
   traceID: string | TNil;
 };