diff --git a/packages/backend-core/src/features/index.ts b/packages/backend-core/src/features/index.ts
index d1d757d8a9..42cd5a79b4 100644
--- a/packages/backend-core/src/features/index.ts
+++ b/packages/backend-core/src/features/index.ts
@@ -136,9 +136,10 @@ export class FlagSet<V extends Flag<any>, T extends { [key: string]: V }> {
         return cachedFlags
       }
 
+      const currentContext = context.getCurrentContext()
       const tags: Record<string, any> = {}
       const flagValues = this.defaults()
-      const currentTenantId = context.getTenantId()
+      const currentTenantId = currentContext?.tenantId
       const specificallySetFalse = new Set<string>()
 
       const split = (env.TENANT_FEATURE_FLAGS || "")