diff --git a/pages/api/hooks/[id].ts b/pages/api/hooks/[id].ts
index 32a81e7b12..3a14efa592 100644
--- a/pages/api/hooks/[id].ts
+++ b/pages/api/hooks/[id].ts
@@ -95,6 +95,27 @@ export async function WebhookById(
             return;
           }
         }
+        if (safeBody.data.eventTypeId) {
+          const team = await ctx.prisma.team.findFirst({
+            where: {
+              eventTypes: {
+                some: {
+                  id: safeBody.data.eventTypeId,
+                },
+              },
+            },
+            include: {
+              members: true,
+            },
+          });
+
+          // Team should be available and the user should be a member of the team
+          if (!team?.members.some((membership) => membership.userId === userId)) {
+            throw new TRPCError({
+              code: "UNAUTHORIZED",
+            });
+          }
+        }
         await prisma.webhook
           .update({ where: { id: safeQuery.data.id }, data: safeBody.data })
           .then((data) => schemaWebhookReadPublic.parse(data))
diff --git a/pages/api/hooks/index.ts b/pages/api/hooks/index.ts
index 422a30e419..e92a681080 100644
--- a/pages/api/hooks/index.ts
+++ b/pages/api/hooks/index.ts
@@ -61,6 +61,27 @@ async function createOrlistAllWebhooks(
       res.status(400).json({ message: "Invalid request body" });
       return;
     }
+    if (safe.data.eventTypeId) {
+      const team = await ctx.prisma.team.findFirst({
+        where: {
+          eventTypes: {
+            some: {
+              id: safe.data.eventTypeId,
+            },
+          },
+        },
+        include: {
+          members: true,
+        },
+      });
+
+      // Team should be available and the user should be a member of the team
+      if (!team?.members.some((membership) => membership.userId === userId)) {
+        throw new TRPCError({
+          code: "UNAUTHORIZED",
+        });
+      }
+    }
     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