diff --git a/packages/db/src/services/id.service.ts b/packages/db/src/services/id.service.ts
index 8b183a1c..28dfb1f1 100644
--- a/packages/db/src/services/id.service.ts
+++ b/packages/db/src/services/id.service.ts
@@ -2,7 +2,10 @@ import { slug } from '@openpanel/common';
 
 import { db } from '../prisma-client';
 
-export async function getId(tableName: 'project' | 'dashboard', name: string) {
+export async function getId(
+  tableName: 'project' | 'dashboard' | 'organization',
+  name: string
+) {
   const newId = slug(name);
   if (!db[tableName]) {
     throw new Error('Table does not exists');
diff --git a/packages/trpc/src/routers/onboarding.ts b/packages/trpc/src/routers/onboarding.ts
index 97be0700..55f9e12b 100644
--- a/packages/trpc/src/routers/onboarding.ts
+++ b/packages/trpc/src/routers/onboarding.ts
@@ -19,7 +19,7 @@ async function createOrGetOrganization(
   if (input.organization) {
     return db.organization.create({
       data: {
-        id: slug(input.organization),
+        id: await getId('organization', input.organization),
         name: input.organization,
         createdByUserId: userId,
       },