diff --git a/pages/api/teams/[teamId]/_patch.ts b/pages/api/teams/[teamId]/_patch.ts
index a8782d5a4c..701464223b 100644
--- a/pages/api/teams/[teamId]/_patch.ts
+++ b/pages/api/teams/[teamId]/_patch.ts
@@ -38,7 +38,14 @@ export async function patchHandler(req: NextApiRequest) {
     where: { id: teamId, members: { some: { userId, role: { in: ["OWNER", "ADMIN"] } } } },
   });
   if (!_team) throw new HttpError({ statusCode: 401, message: "Unauthorized: OWNER or ADMIN required" });
-  const team = await prisma.team.update({ where: { id: teamId }, data });
+  // TODO: Perhaps there is a better fix for this?
+  const cloneData: typeof data & {
+    metadata: NonNullable<typeof data.metadata> | undefined;
+  } = {
+    ...data,
+    metadata: data.metadata === null ? {} : data.metadata || undefined,
+  };
+  const team = await prisma.team.update({ where: { id: teamId }, data: cloneData });
   return { team: schemaTeamReadPublic.parse(team) };
 }
 
diff --git a/pages/api/teams/_post.ts b/pages/api/teams/_post.ts
index 54b8706d55..41207255ce 100644
--- a/pages/api/teams/_post.ts
+++ b/pages/api/teams/_post.ts
@@ -24,9 +24,16 @@ import { schemaTeamBodyParams, schemaTeamReadPublic } from "@lib/validations/tea
 async function postHandler(req: NextApiRequest) {
   const { prisma, body, userId } = req;
   const data = schemaTeamBodyParams.parse(body);
+  // TODO: Perhaps there is a better fix for this?
+  const cloneData: typeof data & {
+    metadata: NonNullable<typeof data.metadata> | undefined;
+  } = {
+    ...data,
+    metadata: data.metadata === null ? {} : data.metadata || undefined,
+  };
   const team = await prisma.team.create({
     data: {
-      ...data,
+      ...cloneData,
       members: {
         // We're also creating the relation membership of team ownership in this call.
         create: { userId, role: "OWNER", accepted: true },