diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index d2d2cee..a5b42c1 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -1,7 +1,7 @@
 version: '3.9'
 services:
   running_on_dart:
-    image: ghcr.io/nyxx-discord/running_on_dart:4.10.0-dev.24
+    image: ghcr.io/nyxx-discord/running_on_dart:4.10.0-dev.25
     container_name: running_on_dart
     env_file:
      - .env
diff --git a/frontend/package.json b/frontend/package.json
index 593e31f..a55f794 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fr",
-  "version": "4.10.0-dev.24",
+  "version": "4.10.0-dev.25",
   "private": true,
   "dependencies": {
     "@emotion/react": "^11.13.5",
diff --git a/frontend/src/page/admin/GuildDetails.tsx b/frontend/src/page/admin/GuildDetails.tsx
index 045a682..fd80781 100644
--- a/frontend/src/page/admin/GuildDetails.tsx
+++ b/frontend/src/page/admin/GuildDetails.tsx
@@ -61,11 +61,7 @@ function TagsDataPaper({dataPromise}: GuildDetailsDataProps) {
     });
 
     useUpdateEffect(() => {
-        if (searchQueryDebounced == null) {
-            return;
-        }
-
-        fetchGuildTags({id: data.id, query: searchQueryDebounced, page: paginationModel.page, perPage: paginationModel.pageSize}).then((t) => setTags(t));
+        fetchGuildTags({id: data.id, query: searchQueryDebounced ?? '', page: paginationModel.page, perPage: paginationModel.pageSize}).then((t) => setTags(t));
     }, [searchQueryDebounced, paginationModel]);
 
     const columns: GridColDef[] = [
@@ -80,7 +76,7 @@ function TagsDataPaper({dataPromise}: GuildDetailsDataProps) {
             <Typography variant='h5'>Tags</Typography>
             <TextField id="tag-name-filter" label="Name..." variant="outlined" size='small' onChange={(e) => setSearchQuery(e.target.value)} />
         </Stack>
-        <DataGrid rows={tags} columns={columns} paginationModel={paginationModel} onPaginationModelChange={setPaginationModel} />
+        <DataGrid rows={tags} columns={columns} paginationModel={paginationModel} onPaginationModelChange={setPaginationModel} paginationMode="server" rowCount={-1} />
     </Stack>;
 }
 
diff --git a/frontend/src/page/admin/Guilds.tsx b/frontend/src/page/admin/Guilds.tsx
index e4a0a28..d4c4534 100644
--- a/frontend/src/page/admin/Guilds.tsx
+++ b/frontend/src/page/admin/Guilds.tsx
@@ -94,7 +94,7 @@ function Grid() {
     ];
 
     return (
-        <DataGrid rows={rows} columns={columns} paginationModel={paginationModel} onPaginationModelChange={setPaginationModel} />
+        <DataGrid rows={rows} columns={columns} paginationModel={paginationModel} onPaginationModelChange={setPaginationModel} paginationMode="server" rowCount={-1} />
     );
 }
 
diff --git a/lib/src/settings.dart b/lib/src/settings.dart
index 4e4f8e2..fccf561 100644
--- a/lib/src/settings.dart
+++ b/lib/src/settings.dart
@@ -2,7 +2,7 @@ import 'dart:io';
 
 import 'package:nyxx/nyxx.dart';
 
-String get version => '4.10.0-dev.24';
+String get version => '4.10.0-dev.25';
 
 /// Get a [String] from an environment variable, throwing an exception if it is not set.
 ///
diff --git a/pubspec.yaml b/pubspec.yaml
index 0c390de..4288f88 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: running_on_dart
-version: 4.10.0-dev.24
+version: 4.10.0-dev.25
 description: Discord Bot for nyxx development
 homepage: https://github.com/nyxx-discord/running_on_dart
 repository: https://github.com/nyxx-discord/running_on_dart