diff --git a/packages/lib/src/resultset-table/ResultsetTable.tsx b/packages/lib/src/resultset-table/ResultsetTable.tsx index f68330b574..ddc7e2fdfa 100644 --- a/packages/lib/src/resultset-table/ResultsetTable.tsx +++ b/packages/lib/src/resultset-table/ResultsetTable.tsx @@ -105,11 +105,15 @@ const DxcResultsetTable = ({ if (!hidePaginator) { if (rows.length === 0) { changePage(0); - } else if (rows.length < prevRowCountRef.current) { - const lastPage = Math.ceil(rows.length / itemsPerPage); - const prevLastPage = Math.ceil(prevRowCountRef.current / itemsPerPage); - if (lastPage < prevLastPage) { - changePage(Math.min(lastPage, page)); + } else { + if (page === 0) { + changePage(1); + } else if (rows.length < prevRowCountRef.current) { + const lastPage = Math.ceil(rows.length / itemsPerPage); + const prevLastPage = Math.ceil(prevRowCountRef.current / itemsPerPage); + if (lastPage < prevLastPage) { + changePage(Math.min(lastPage, page)); + } } } prevRowCountRef.current = rows.length;