diff --git a/apps/admin-ui/src/components/table-toolbar/KeycloakDataTable.tsx b/apps/admin-ui/src/components/table-toolbar/KeycloakDataTable.tsx
index 9168331d0a..06423593ca 100644
--- a/apps/admin-ui/src/components/table-toolbar/KeycloakDataTable.tsx
+++ b/apps/admin-ui/src/components/table-toolbar/KeycloakDataTable.tsx
@@ -279,14 +279,16 @@ export function KeycloakDataTable<T>({
     () =>
       search === "" || isPaginated
         ? undefined
-        : convertToColumns(unPaginatedData || []).filter((row) =>
-            row.cells.some(
-              (cell) =>
-                cell &&
-                getNodeText(cell).toLowerCase().includes(search.toLowerCase())
+        : convertToColumns(unPaginatedData || [])
+            .filter((row) =>
+              row.cells.some(
+                (cell) =>
+                  cell &&
+                  getNodeText(cell).toLowerCase().includes(search.toLowerCase())
+              )
             )
-          ),
-    [search]
+            .slice(first, first + max + 1),
+    [search, first, max]
   );
 
   useEffect(() => {