diff --git a/frontend/src/Editor/Components/Table/Table.jsx b/frontend/src/Editor/Components/Table/Table.jsx
index 1168c5344b..c149d1e48c 100644
--- a/frontend/src/Editor/Components/Table/Table.jsx
+++ b/frontend/src/Editor/Components/Table/Table.jsx
@@ -657,7 +657,7 @@ export function Table({
 
   React.useEffect(() => {
     if (serverSidePagination || !clientSidePagination) {
-      setPageSize(-1);
+      setPageSize(rows?.length || 10);
     }
     if (!serverSidePagination && clientSidePagination) {
       setPageSize(10);