diff --git a/studio/components/grid/components/footer/pagination/Pagination.tsx b/studio/components/grid/components/footer/pagination/Pagination.tsx index 31609a32fd0..22597427acd 100644 --- a/studio/components/grid/components/footer/pagination/Pagination.tsx +++ b/studio/components/grid/components/footer/pagination/Pagination.tsx @@ -24,7 +24,7 @@ type PaginationProps = {} const Pagination: FC = () => { const state = useTrackedState() const dispatch = useDispatch() - const [page, setPage] = useState(state.page) + const [page, setPage] = useState(state.page) const maxPages = Math.ceil(state.totalRows / state.rowsPerPage) const totalPages = state.totalRows > 0 ? maxPages : 1 @@ -90,8 +90,10 @@ const Pagination: FC = () => { function onPageChange(event: React.ChangeEvent) { const value = event.target.value const pageNum = Number(value) > maxPages ? maxPages : Number(value) - setPage(pageNum) - updatePageDebounced(pageNum, dispatch) + setPage(pageNum || null) + if (pageNum) { + updatePageDebounced(pageNum, dispatch) + } } function onRowsPerPageChange(value: string | number) { @@ -114,6 +116,8 @@ const Pagination: FC = () => {

Page