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) => {