diff --git a/packages/lib/src/data-grid/DataGrid.tsx b/packages/lib/src/data-grid/DataGrid.tsx
index 4caf502637..3035bbeb22 100644
--- a/packages/lib/src/data-grid/DataGrid.tsx
+++ b/packages/lib/src/data-grid/DataGrid.tsx
@@ -260,7 +260,7 @@ const DxcDataGrid = ({
           summaryRowHeight={colorsTheme.dataGrid.summaryRowHeight}
           className="fill-grid"
         />
-        {showPaginator && (
+        {showPaginator && (totalItems ?? rows.length) > itemsPerPage && (
           <DxcPaginator
             totalItems={totalItems ?? rows.length}
             itemsPerPage={itemsPerPage}
diff --git a/packages/lib/src/resultset-table/ResultsetTable.stories.tsx b/packages/lib/src/resultset-table/ResultsetTable.stories.tsx
index 92d02d1cbe..2b2f77f5fa 100644
--- a/packages/lib/src/resultset-table/ResultsetTable.stories.tsx
+++ b/packages/lib/src/resultset-table/ResultsetTable.stories.tsx
@@ -409,7 +409,7 @@ export const AscendentSorting: Story = {
   play: async ({ canvasElement }) => {
     const canvas = within(canvasElement);
     const idHeader = canvas.getAllByRole("button")[0];
-    const idHeader2 = canvas.getAllByRole("button")[6];
+    const idHeader2 = canvas.getAllByRole("button")[2];
     idHeader && (await userEvent.click(idHeader));
     idHeader2 && (await userEvent.click(idHeader2));
   },
@@ -420,7 +420,7 @@ export const DescendantSorting: Story = {
   play: async ({ canvasElement }) => {
     const canvas = within(canvasElement);
     const nameHeader = canvas.getAllByRole("button")[1];
-    const nameHeader2 = canvas.getAllByRole("button")[7];
+    const nameHeader2 = canvas.getAllByRole("button")[3];
     nameHeader && (await userEvent.click(nameHeader));
     nameHeader && (await userEvent.click(nameHeader));
     nameHeader2 && (await userEvent.click(nameHeader2));
diff --git a/packages/lib/src/resultset-table/ResultsetTable.tsx b/packages/lib/src/resultset-table/ResultsetTable.tsx
index e304e05865..a4989a2eb9 100644
--- a/packages/lib/src/resultset-table/ResultsetTable.tsx
+++ b/packages/lib/src/resultset-table/ResultsetTable.tsx
@@ -166,7 +166,7 @@ const DxcResultsetTable = ({
             ))}
           </tbody>
         </DxcTable>
-        {!hidePaginator && (
+        {!hidePaginator && rows.length > itemsPerPage && (
           <DxcPaginator
             totalItems={rows.length}
             itemsPerPage={itemsPerPage}