diff --git a/packages/react-components/src/components/abstract-xy-output-component.tsx b/packages/react-components/src/components/abstract-xy-output-component.tsx
index 79fa2f92a..c724ca2ce 100644
--- a/packages/react-components/src/components/abstract-xy-output-component.tsx
+++ b/packages/react-components/src/components/abstract-xy-output-component.tsx
@@ -17,7 +17,6 @@ import { BIMath } from 'timeline-chart/lib/bigint-utils';
 import { XYChartFactoryParams, xyChartFactory, GetClosestPointParam, getClosestPointForScatterPlot } from './utils/xy-output-component-utils';
 import { ChartOptions } from 'chart.js';
 import { Line, Scatter } from 'react-chartjs-2';
-import { signalManager, Signals } from 'traceviewer-base/lib/signals/signal-manager';
 import { getAllExpandedNodeIds } from './utils/filter-tree/utils';
 import { throttle } from 'lodash';
 
@@ -98,8 +97,6 @@ export abstract class AbstractXYOutputComponent<P extends AbstractOutputProps, S
     protected positionXMove = 0;
     protected startPositionMouseRightClick = BigInt(0);
 
-    // Event handlers
-    protected onSelectionChanged = (payload: { [key: string]: string; }) => this.doHandleSelectionChangedSignal(payload);
     protected endSelection = (event: MouseEvent): void => {
         if (this.clickedMouseButton === MouseButton.RIGHT) {
            this.applySelectionZoom();
@@ -136,7 +133,6 @@ export abstract class AbstractXYOutputComponent<P extends AbstractOutputProps, S
         this.divRef = React.createRef();
         this.chartRef = React.createRef();
 
-        signalManager().on(Signals.SELECTION_CHANGED, this.onSelectionChanged);
         this.afterChartDraw = this.afterChartDraw.bind(this);
     }
 
@@ -186,20 +182,6 @@ export abstract class AbstractXYOutputComponent<P extends AbstractOutputProps, S
         this.setState({checkedSeries: newList});
     }
 
-    private doHandleSelectionChangedSignal(payload: { [key: string]: string }) {
-        const offset = this.props.viewRange.getOffset() || BigInt(0);
-        const startTimestamp = payload['startTimestamp'];
-        const endTimestamp = payload['endTimestamp'];
-        if (startTimestamp !== undefined && endTimestamp !== undefined) {
-            const selectionRangeStart = BigInt(startTimestamp) - offset;
-            const selectionRangeEnd = BigInt(endTimestamp) - offset;
-            this.props.unitController.selectionRange = {
-                start: selectionRangeStart,
-                end: selectionRangeEnd
-            };
-        }
-    }
-
     private updateRange(rangeStart: bigint, rangeEnd: bigint): void {
         if (rangeEnd < rangeStart) {
             const temp = rangeStart;
@@ -264,7 +246,6 @@ export abstract class AbstractXYOutputComponent<P extends AbstractOutputProps, S
 
     componentWillUnmount(): void {
         super.componentWillUnmount();
-        signalManager().off(Signals.SELECTION_CHANGED, this.onSelectionChanged);
     }
 
     async fetchTree(): Promise<ResponseStatus> {
diff --git a/packages/react-components/src/components/table-output-component.tsx b/packages/react-components/src/components/table-output-component.tsx
index 8c1db8c40..44bc8909a 100644
--- a/packages/react-components/src/components/table-output-component.tsx
+++ b/packages/react-components/src/components/table-output-component.tsx
@@ -427,10 +427,25 @@ export class TableOutputComponent extends AbstractOutputComponent<TableOutputPro
             const payload = { startTimestamp, endTimestamp, load };
             this.prevStartTimestamp = BigInt(startTimestamp);
             this.eventSignal = true;
+            this.handleSelectionRangeUpdate(payload);
             signalManager().fireSelectionChangedSignal(payload);
         }
     }
 
+    private handleSelectionRangeUpdate(payload: { [key: string]: string; }) {
+        const offset = this.props.viewRange.getOffset() || BigInt(0);
+        const startTimestamp = payload['startTimestamp'];
+        const endTimestamp = payload['endTimestamp'];
+        if (startTimestamp !== undefined && endTimestamp !== undefined) {
+            const selectionRangeStart = BigInt(startTimestamp) - offset;
+            const selectionRangeEnd = BigInt(endTimestamp) - offset;
+            this.props.unitController.selectionRange = {
+                start: selectionRangeStart,
+                end: selectionRangeEnd
+            };
+        }
+    }
+
     private async handleTimeSelectionChange(range?: TimelineChart.TimeGraphRange) {
         if (range) {
             if (this.eventSignal) {
diff --git a/packages/react-components/src/components/timegraph-output-component.tsx b/packages/react-components/src/components/timegraph-output-component.tsx
index 616ce7fb1..ceff2a14d 100644
--- a/packages/react-components/src/components/timegraph-output-component.tsx
+++ b/packages/react-components/src/components/timegraph-output-component.tsx
@@ -285,12 +285,9 @@ export class TimegraphOutputComponent extends AbstractTreeOutputComponent<Timegr
     }
 
     private doHandleSelectionChangedSignal(payload: { [key: string]: string }) {
-        const offset = this.props.viewRange.getOffset() || BigInt(0);
         const startTimestamp = payload['startTimestamp'];
         const endTimestamp = payload['endTimestamp'];
         if (startTimestamp !== undefined && endTimestamp !== undefined) {
-            const selectionRangeStart = BigInt(startTimestamp) - offset;
-            const selectionRangeEnd = BigInt(endTimestamp) - offset;
             const foundElement = this.findElement(payload);
 
             // Scroll vertically
@@ -302,12 +299,6 @@ export class TimegraphOutputComponent extends AbstractTreeOutputComponent<Timegr
                     this.pendingSelection = foundElement;
                 }
             }
-
-            // Scroll horizontally
-            this.props.unitController.selectionRange = {
-                start: selectionRangeStart,
-                end: selectionRangeEnd
-            };
             this.chartCursors.maybeCenterCursor();
         }
     }