diff --git a/webapp/src/components/common/DataGrid.tsx b/webapp/src/components/common/DataGrid.tsx
index 39659f4e24..40eb3ad8c0 100644
--- a/webapp/src/components/common/DataGrid.tsx
+++ b/webapp/src/components/common/DataGrid.tsx
@@ -46,7 +46,6 @@ export interface DataGridProps extends Omit<DataEditorProps, "rowMarkers" | "gri
 }
 
 const ROW_HEIGHT = 30;
-const OVERSCROLL = 2;
 
 function isStringRowMarkerOptions(
   rowMarkerOptions: RowMarkersOptions,
@@ -75,11 +74,6 @@ function DataGrid({
   const isStringRowMarkers = isStringRowMarkerOptions(rowMarkersOptions);
   const adjustedFreezeColumns = isStringRowMarkers ? (freezeColumns || 0) + 1 : freezeColumns;
 
-  // Manually calculate the height allows to remove the blank space at the bottom of the grid
-  // when there is no scrollbar. Header is included in the height calculation.
-  //! Group header is not included, fix it when needed.
-  const height = ROW_HEIGHT * (rows + 1) + OVERSCROLL;
-
   const [columns, setColumns] = useState(initColumns);
   const [gridSelection, setGridSelection] = useState<GridSelection>({
     rows: CompactSelection.empty(),
@@ -281,12 +275,8 @@ function DataGrid({
       rowHeight={ROW_HEIGHT}
       smoothScrollX
       smoothScrollY
-      overscrollX={OVERSCROLL}
-      overscrollY={OVERSCROLL}
       width="100%"
-      height={height}
       theme={darkTheme}
-      {...rest}
       rows={rows}
       columns={columns}
       rowMarkers={isStringRowMarkers ? "none" : rowMarkersOptions}
@@ -299,6 +289,7 @@ function DataGrid({
       gridSelection={gridSelection}
       onGridSelectionChange={handleGridSelectionChange}
       freezeColumns={adjustedFreezeColumns}
+      {...rest}
     />
   );
 }