diff --git a/packages/grafana-ui/src/components/Table/RowsList.tsx b/packages/grafana-ui/src/components/Table/RowsList.tsx
index b994f18b541..26424abd922 100644
--- a/packages/grafana-ui/src/components/Table/RowsList.tsx
+++ b/packages/grafana-ui/src/components/Table/RowsList.tsx
@@ -80,6 +80,9 @@ export const RowsList = (props: RowsListProps) => {
   } = props;
 
   const [rowHighlightIndex, setRowHighlightIndex] = useState<number | undefined>(initialRowIndex);
+  if (initialRowIndex === undefined && rowHighlightIndex !== undefined) {
+    setRowHighlightIndex(undefined);
+  }
 
   const theme = useTheme2();
   const panelContext = usePanelContext();