diff --git a/.jules/bolt.md b/.jules/bolt.md
new file mode 100644
index 0000000..3d8deb1
--- /dev/null
+++ b/.jules/bolt.md
@@ -0,0 +1,3 @@
+## 2024-05-14 - Bypass redundant getWorkspaceExperienceBySlug calls in tenant resolution
+**Learning:** When fetching organizations upfront (like in batch queries for memberships), calling `getWorkspaceExperienceBySlug` introduces redundant database lookups because it refetches the organization. `compileWorkspaceExperience` can be called directly synchronously if the `Organization` object is already available.
+**Action:** Always check if the full `Organization` object is already fetched in the current execution flow. If so, bypass cached fetchers and directly use `compileWorkspaceExperience` to avoid N+1-like redundant queries during tenant resolution.
diff --git a/lib/application/auth/tenant-access-selection.ts b/lib/application/auth/tenant-access-selection.ts
index 75e45ac..ffe475b 100644
--- a/lib/application/auth/tenant-access-selection.ts
+++ b/lib/application/auth/tenant-access-selection.ts
@@ -8,9 +8,9 @@ export interface MembershipSelectionOrganization {
   slug: string;
 }
 
-export function selectMembershipOrganization(input: {
+export function selectMembershipOrganization<T extends MembershipSelectionOrganization>(input: {
   memberships: MembershipSelectionMember[];
-  organizationsById: Map<string, MembershipSelectionOrganization>;
+  organizationsById: Map<string, T>;
   requestedSlug?: string | null;
 }) {
   const requestedSlug = input.requestedSlug?.trim() || null;
diff --git a/lib/application/auth/tenant-access.ts b/lib/application/auth/tenant-access.ts
index 09f0d27..ffe4f4d 100644
--- a/lib/application/auth/tenant-access.ts
+++ b/lib/application/auth/tenant-access.ts
@@ -12,6 +12,7 @@ import {
 } from "@/lib/application/auth/tenant-routing";
 import { selectMembershipOrganization } from "@/lib/application/auth/tenant-access-selection";
 import { getWorkspaceExperienceBySlug } from "@/lib/application/workspace/workspace-service";
+import { compileWorkspaceExperience } from "@/lib/platform/workspace/compiler";
 import { OrganizationMemberRepository } from "@/lib/infrastructure/supabase/organization-member-repository";
 import { OrganizationRepository } from "@/lib/infrastructure/supabase/organization-repository";
 import { resolveWorkspaceTemplateForEmailDomain } from "@/lib/platform/workspace/registry";
@@ -110,7 +111,7 @@ export async function resolveTenantAccess(
     });
 
     if (organization) {
-      const workspace = await getWorkspaceExperienceBySlug(organization.slug);
+      const workspace = compileWorkspaceExperience({ slug: organization.slug, organization });
       return existingWorkspaceAccess({
         slug: organization.slug,
         name: organization.name,
@@ -124,7 +125,7 @@ export async function resolveTenantAccess(
   if (emailDomain) {
     const workspaceOrganization = await organizations.findFirstByWorkspaceEmailDomain(emailDomain);
     if (workspaceOrganization && (!requestedSlug || workspaceOrganization.slug === requestedSlug)) {
-      const workspace = await getWorkspaceExperienceBySlug(workspaceOrganization.slug);
+      const workspace = compileWorkspaceExperience({ slug: workspaceOrganization.slug, organization: workspaceOrganization });
       return existingWorkspaceAccess({
         slug: workspaceOrganization.slug,
         name: workspaceOrganization.name,
@@ -143,7 +144,7 @@ export async function resolveTenantAccess(
     if (guessed.slug) {
       const existingOrganization = await organizations.findBySlug(guessed.slug).catch(() => null);
       if (existingOrganization) {
-        const workspace = await getWorkspaceExperienceBySlug(existingOrganization.slug);
+        const workspace = compileWorkspaceExperience({ slug: existingOrganization.slug, organization: existingOrganization });
         return existingWorkspaceAccess({
           slug: existingOrganization.slug,
           name: existingOrganization.name,