diff --git a/src/components/datagrid/data_grid_body.tsx b/src/components/datagrid/data_grid_body.tsx
index b67372621d..cb8679fa7c 100644
--- a/src/components/datagrid/data_grid_body.tsx
+++ b/src/components/datagrid/data_grid_body.tsx
@@ -629,7 +629,7 @@ export const OuiDataGridBody: FunctionComponent<OuiDataGridBodyProps> = (
   }, [getRowHeight]);
 
   const rowCountToAffordFor = pagination
-    ? pagination.pageSize
+    ? Math.min(pagination.pageSize, rowCount)
     : visibleRowIndices.length;
   const unconstrainedHeight =
     defaultHeight * rowCountToAffordFor + headerRowHeight + footerRowHeight;