diff --git a/packages/react-data-grid-react-window-grid/src/components/DataGridBody/useDataGridBody.tsx b/packages/react-data-grid-react-window-grid/src/components/DataGridBody/useDataGridBody.tsx
index 81418959..280a1263 100644
--- a/packages/react-data-grid-react-window-grid/src/components/DataGridBody/useDataGridBody.tsx
+++ b/packages/react-data-grid-react-window-grid/src/components/DataGridBody/useDataGridBody.tsx
@@ -92,6 +92,17 @@ export const useDataGridBody_unstable = (
     [headerListRef]
   );
 
+  const combinedOnScroll = React.useCallback(
+    (scrollProps: GridOnScrollProps) => {
+      onScroll(scrollProps);
+
+      if (gridProps && gridProps.onScroll) {
+        gridProps.onScroll(scrollProps);
+      }
+    },
+    [onScroll, gridProps]
+  );
+
   return {
     ...baseState,
     rowHeight,
@@ -103,8 +114,8 @@ export const useDataGridBody_unstable = (
     ariaRowIndexStart,
     gridRef: bodyRef,
     gridProps: {
-      onScroll,
       ...gridProps,
+      onScroll: combinedOnScroll,
     },
   };
 };