diff --git a/server/routers/resource/createResource.ts b/server/routers/resource/createResource.ts
index f6ac25d3..fbdca68a 100644
--- a/server/routers/resource/createResource.ts
+++ b/server/routers/resource/createResource.ts
@@ -75,7 +75,7 @@ export async function createResource(req: Request, res: Response, next: NextFunc
         }
 
         // Generate a unique resourceId
-        const resourceId = `${subdomain}.${org[0].domain}`;
+        const resourceId = `${subdomain}.${org[0].orgId}.${org[0].domain}`;
 
         // Create new resource in the database
         const newResource = await db.insert(resources).values({