From 9fef0752a1751bd7dde45abf96d2dc6b550fa62f Mon Sep 17 00:00:00 2001
From: Etienne <45695613+etiennejouan@users.noreply.github.com>
Date: Wed, 5 Nov 2025 16:16:26 +0100
Subject: [PATCH] Fix subdomain generation at workspace creation (#15649)

---
 .../subdomain-manager/services/subdomain-manager.service.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/twenty-server/src/engine/core-modules/domain/subdomain-manager/services/subdomain-manager.service.ts b/packages/twenty-server/src/engine/core-modules/domain/subdomain-manager/services/subdomain-manager.service.ts
index 31086523fb..bf9a59df26 100644
--- a/packages/twenty-server/src/engine/core-modules/domain/subdomain-manager/services/subdomain-manager.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/domain/subdomain-manager/services/subdomain-manager.service.ts
@@ -45,8 +45,9 @@ export class SubdomainManagerService {
       ? extractedSubdomain
       : generateRandomSubdomain();
 
-    const existingWorkspaceCount = await this.workspaceRepository.countBy({
-      subdomain,
+    const existingWorkspaceCount = await this.workspaceRepository.count({
+      where: { subdomain },
+      withDeleted: true,
     });
 
     return `${subdomain}${existingWorkspaceCount > 0 ? `-${Math.random().toString(36).substring(2, 10)}` : ''}`;
@@ -55,6 +56,7 @@ export class SubdomainManagerService {
   async isSubdomainAvailable(subdomain: string) {
     const existingWorkspace = await this.workspaceRepository.findOne({
       where: { subdomain: subdomain },
+      withDeleted: true,
     });
 
     return !existingWorkspace;