diff --git a/apps/api/src/controllers/export.controller.ts b/apps/api/src/controllers/export.controller.ts
index 4458840f..bca5a35d 100644
--- a/apps/api/src/controllers/export.controller.ts
+++ b/apps/api/src/controllers/export.controller.ts
@@ -32,7 +32,7 @@ async function getProjectId(
 
     const project = await db.project.findUnique({
       where: {
-        organizationSlug: request.client?.organizationSlug,
+        organizationId: request.client?.organizationSlug,
         id: projectId,
       },
     });
diff --git a/apps/dashboard/src/app/api/clerk/webhook/route.ts b/apps/dashboard/src/app/api/clerk/webhook/route.ts
index 845cca6b..544e6ce1 100644
--- a/apps/dashboard/src/app/api/clerk/webhook/route.ts
+++ b/apps/dashboard/src/app/api/clerk/webhook/route.ts
@@ -50,6 +50,7 @@ export async function POST(request: Request) {
             .filter((a) => typeof a === 'string')
             .map((projectId) => ({
               organizationSlug: membership.organizationId,
+              organizationId: membership.organizationId,
               projectId: projectId,
               userId: user.id,
               level: AccessLevel.read,
@@ -67,6 +68,7 @@ export async function POST(request: Request) {
           .filter((a): a is string => typeof a === 'string')
           .map((projectId) => ({
             organizationSlug: payload.data.organization.slug,
+            organizationId: payload.data.organization.slug,
             projectId: projectId,
             userId: payload.data.public_user_data.user_id,
             level: AccessLevel.read,
diff --git a/packages/trpc/src/routers/client.ts b/packages/trpc/src/routers/client.ts
index e657efd9..481968d5 100644
--- a/packages/trpc/src/routers/client.ts
+++ b/packages/trpc/src/routers/client.ts
@@ -41,6 +41,7 @@ export const clientRouter = createTRPCRouter({
       const secret = randomUUID();
       const data: Prisma.ClientCreateArgs['data'] = {
         organizationSlug: input.organizationSlug,
+        organizationId: input.organizationSlug,
         projectId: input.projectId,
         name: input.name,
         type: input.type ?? 'write',
diff --git a/packages/trpc/src/routers/dashboard.ts b/packages/trpc/src/routers/dashboard.ts
index 6ae8623f..4cdd2713 100644
--- a/packages/trpc/src/routers/dashboard.ts
+++ b/packages/trpc/src/routers/dashboard.ts
@@ -30,6 +30,7 @@ export const dashboardRouter = createTRPCRouter({
           id: await getId('dashboard', name),
           projectId: projectId,
           organizationSlug: organizationSlug,
+          organizationId: organizationSlug,
           name,
         },
       });
diff --git a/packages/trpc/src/routers/onboarding.ts b/packages/trpc/src/routers/onboarding.ts
index 146ce870..8e77ec93 100644
--- a/packages/trpc/src/routers/onboarding.ts
+++ b/packages/trpc/src/routers/onboarding.ts
@@ -52,6 +52,7 @@ export const onboardingRouter = createTRPCRouter({
           id: await getId('project', input.project),
           name: input.project,
           organizationSlug: organization.id,
+          organizationId: organization.id,
           types,
         },
       });
@@ -61,6 +62,7 @@ export const onboardingRouter = createTRPCRouter({
         data: {
           name: `${project.name} Client`,
           organizationSlug: organization.id,
+          organizationId: organization.id,
           projectId: project.id,
           type: 'write',
           cors: input.domain ? stripTrailingSlash(input.domain) : null,
diff --git a/packages/trpc/src/routers/organization.ts b/packages/trpc/src/routers/organization.ts
index d2f2f82e..a28fd369 100644
--- a/packages/trpc/src/routers/organization.ts
+++ b/packages/trpc/src/routers/organization.ts
@@ -98,7 +98,7 @@ export const organizationRouter = createTRPCRouter({
         db.projectAccess.deleteMany({
           where: {
             userId: input.userId,
-            organizationSlug: input.organizationId,
+            organizationId: input.organizationId,
           },
         }),
       ]);
@@ -117,13 +117,14 @@ export const organizationRouter = createTRPCRouter({
         db.projectAccess.deleteMany({
           where: {
             userId: input.userId,
-            organizationSlug: input.organizationSlug,
+            organizationId: input.organizationSlug,
           },
         }),
         db.projectAccess.createMany({
           data: input.access.map((projectId) => ({
             userId: input.userId,
             organizationSlug: input.organizationSlug,
+            organizationId: input.organizationSlug,
             projectId: projectId,
             level: 'read',
           })),
diff --git a/packages/trpc/src/routers/project.ts b/packages/trpc/src/routers/project.ts
index 444826f2..9beed89b 100644
--- a/packages/trpc/src/routers/project.ts
+++ b/packages/trpc/src/routers/project.ts
@@ -45,6 +45,7 @@ export const projectRouter = createTRPCRouter({
         data: {
           id: await getId('project', name),
           organizationSlug: organizationSlug,
+          organizationId: organizationSlug,
           name: name,
         },
       });
diff --git a/packages/trpc/src/routers/share.ts b/packages/trpc/src/routers/share.ts
index fd7ee624..b6613114 100644
--- a/packages/trpc/src/routers/share.ts
+++ b/packages/trpc/src/routers/share.ts
@@ -18,6 +18,7 @@ export const shareRouter = createTRPCRouter({
         create: {
           id: uid.rnd(),
           organizationSlug: input.organizationSlug,
+          organizationId: input.organizationSlug,
           projectId: input.projectId,
           public: input.public,
           password: input.password || null,