diff --git a/lib/helpers/verifyApiKey.ts b/lib/helpers/verifyApiKey.ts
index 38fa6b44c3..c45f3d3c3f 100644
--- a/lib/helpers/verifyApiKey.ts
+++ b/lib/helpers/verifyApiKey.ts
@@ -11,7 +11,6 @@ declare module "next" {
     userId: number;
     method: string;
     query: { [key: string]: string | string[] };
-    body: any;
   }
 }
 
diff --git a/lib/utils/isAdmin.ts b/lib/utils/isAdmin.ts
index c97628b46d..64af37367f 100644
--- a/lib/utils/isAdmin.ts
+++ b/lib/utils/isAdmin.ts
@@ -1,5 +1,6 @@
+import { UserPermissionRole } from "@prisma/client";
+
 import prisma from "@calcom/prisma";
-import { UserPermissionRole } from "@calcom/prisma/client";
 
 export const isAdminGuard = async (userId: number) => {
   const user = await prisma.user.findUnique({ where: { id: userId } });
diff --git a/lib/validations/webhook.ts b/lib/validations/webhook.ts
index ee42052204..c157a6e367 100644
--- a/lib/validations/webhook.ts
+++ b/lib/validations/webhook.ts
@@ -26,7 +26,7 @@ const schemaWebhookBaseBodyParams = Webhook.pick({
 
 export const schemaWebhookCreateParams = z
   .object({
-    id: z.string(),
+    // id: z.string(),
     subscriberUrl: z.string().url(),
     eventTriggers: z.enum(WEBHOOK_TRIGGER_EVENTS).array(),
     active: z.boolean(),
diff --git a/pages/api/hooks/[id].ts b/pages/api/hooks/[id].ts
index dcf82aaa2d..32a81e7b12 100644
--- a/pages/api/hooks/[id].ts
+++ b/pages/api/hooks/[id].ts
@@ -51,7 +51,7 @@ export async function WebhookById(
       case "GET":
         await prisma.webhook
           .findUnique({ where: { id: safeQuery.data.id } })
-          // .then((data) => schemaWebhookReadPublic.parse(data))
+          .then((data) => schemaWebhookReadPublic.parse(data))
           .then((webhook) => res.status(200).json({ webhook }))
           .catch((error: Error) =>
             res.status(404).json({
@@ -97,7 +97,7 @@ export async function WebhookById(
         }
         await prisma.webhook
           .update({ where: { id: safeQuery.data.id }, data: safeBody.data })
-          // .then((data) => schemaWebhookReadPublic.parse(data))
+          .then((data) => schemaWebhookReadPublic.parse(data))
           .then((webhook) => res.status(200).json({ webhook }))
           .catch((error: Error) =>
             res.status(404).json({
diff --git a/pages/api/hooks/index.ts b/pages/api/hooks/index.ts
index 05b6e90d57..422a30e419 100644
--- a/pages/api/hooks/index.ts
+++ b/pages/api/hooks/index.ts
@@ -1,4 +1,5 @@
 import type { NextApiRequest, NextApiResponse } from "next";
+import { v4 as uuidv4 } from "uuid";
 
 import prisma from "@calcom/prisma";
 
@@ -60,7 +61,7 @@ async function createOrlistAllWebhooks(
       res.status(400).json({ message: "Invalid request body" });
       return;
     }
-    const data = await prisma.webhook.create({ data: { ...safe.data, userId } });
+    const data = await prisma.webhook.create({ data: { id: uuidv4(), ...safe.data, userId } });
     if (data) res.status(201).json({ webhook: data, message: "Webhook created successfully" });
     else
       (error: Error) =>