diff --git a/packages/core-service/src/core/tenants/tenants.controller.ts b/packages/core-service/src/core/tenants/tenants.controller.ts
index bb77761..6566244 100644
--- a/packages/core-service/src/core/tenants/tenants.controller.ts
+++ b/packages/core-service/src/core/tenants/tenants.controller.ts
@@ -33,10 +33,13 @@ export class TenantsController {
   @UseGuards(RolesGuard)
   @ApiOperation({ summary: 'Alle Mandanten auflisten (Admin)' })
   async findAll(
-    @Query('page') page?: number,
-    @Query('limit') limit?: number,
+    @Query('page') page?: string,
+    @Query('limit') limit?: string,
   ) {
-    return this.tenantsService.findAll(page ?? 1, limit ?? 20);
+    return this.tenantsService.findAll(
+      Number(page) || 1,
+      Number(limit) || 20,
+    );
   }
 
   /**
diff --git a/packages/core-service/src/core/users/users.controller.ts b/packages/core-service/src/core/users/users.controller.ts
index 83b1da8..1552383 100644
--- a/packages/core-service/src/core/users/users.controller.ts
+++ b/packages/core-service/src/core/users/users.controller.ts
@@ -42,10 +42,13 @@ export class UsersController {
   @UseGuards(RolesGuard)
   @ApiOperation({ summary: 'Alle Benutzer auflisten (Admin)' })
   async findAll(
-    @Query('page') page?: number,
-    @Query('limit') limit?: number,
+    @Query('page') page?: string,
+    @Query('limit') limit?: string,
   ) {
-    return this.usersService.findAll(page ?? 1, limit ?? 20);
+    return this.usersService.findAll(
+      Number(page) || 1,
+      Number(limit) || 20,
+    );
   }
 
   /**