diff --git a/pages/api/users/[id].ts b/pages/api/users/[id].ts
index bf70a7a785..65b864c652 100644
--- a/pages/api/users/[id].ts
+++ b/pages/api/users/[id].ts
@@ -4,6 +4,7 @@ import prisma from "@calcom/prisma";
 
 import { withMiddleware } from "@lib/helpers/withMiddleware";
 import type { UserResponse } from "@lib/types";
+import { isAdminGuard } from "@lib/utils/isAdmin";
 import {
   schemaQueryIdParseInt,
   withValidQueryIdTransformParseInt,
@@ -11,7 +12,7 @@ import {
 import { schemaUserEditBodyParams, schemaUserReadPublic } from "@lib/validations/user";
 
 export async function userById(
-  { method, query, body, userId, isAdmin }: NextApiRequest,
+  { method, query, body, userId }: NextApiRequest,
   res: NextApiResponse<UserResponse>
 ) {
   const safeQuery = schemaQueryIdParseInt.safeParse(query);
@@ -20,6 +21,7 @@ export async function userById(
     res.status(400).json({ message: "Your query was invalid" });
     return;
   }
+  const isAdmin = await isAdminGuard(userId);
   // Here we only check for ownership of the user if the user is not admin, otherwise we let ADMIN's edit any user
   if (!isAdmin) {
     if (safeQuery.data.id !== userId) res.status(401).json({ message: "Unauthorized" });
diff --git a/pages/api/users/index.ts b/pages/api/users/index.ts
index d94f198ad8..3839ae21b6 100644
--- a/pages/api/users/index.ts
+++ b/pages/api/users/index.ts
@@ -4,6 +4,7 @@ import prisma from "@calcom/prisma";
 
 import { withMiddleware } from "@lib/helpers/withMiddleware";
 import { UserResponse, UsersResponse } from "@lib/types";
+import { isAdminGuard } from "@lib/utils/isAdmin";
 import { schemaUserReadPublic, schemaUserCreateBodyParams } from "@lib/validations/user";
 
 /**
@@ -23,9 +24,10 @@ import { schemaUserReadPublic, schemaUserCreateBodyParams } from "@lib/validatio
  *         description: No users were found
  */
 async function getAllorCreateUser(
-  { userId, method, body, isAdmin }: NextApiRequest,
+  { userId, method, body }: NextApiRequest,
   res: NextApiResponse<UsersResponse | UserResponse>
 ) {
+  const isAdmin = await isAdminGuard(userId);
   if (method === "GET") {
     if (!isAdmin) {
       // If user is not ADMIN, return only his data.