From 4c565425c5cac806db9a4a391af18b8ab31198e1 Mon Sep 17 00:00:00 2001
From: Weiko <corentin@twenty.com>
Date: Thu, 22 Jan 2026 13:33:29 +0100
Subject: [PATCH] Fix workspace resolver when billing is not enabled (#17333)

---
 .../billing/services/billing-subscription.service.ts      | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/twenty-server/src/engine/core-modules/billing/services/billing-subscription.service.ts b/packages/twenty-server/src/engine/core-modules/billing/services/billing-subscription.service.ts
index 4ae2a27c3b..3d74a0a151 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/services/billing-subscription.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/services/billing-subscription.service.ts
@@ -184,9 +184,11 @@ export class BillingSubscriptionService {
       this.twentyConfigService.get('ENTERPRISE_KEY'),
     );
 
-    const entitlements = await this.billingEntitlementRepository.find({
-      where: { workspaceId },
-    });
+    const entitlements = isBillingEnabled
+      ? await this.billingEntitlementRepository.find({
+          where: { workspaceId },
+        })
+      : [];
 
     const entitlementsByKey = entitlements.reduce(
       (acc, entitlement) => {