diff --git a/.jules/bolt.md b/.jules/bolt.md
new file mode 100644
index 0000000..79e9d84
--- /dev/null
+++ b/.jules/bolt.md
@@ -0,0 +1,3 @@
+## 2024-07-05 - Avoid redundant database queries for cached Workspace Service
+**Learning:** React's `cache` memoizes the promise returned by `getWorkspaceExperienceBySlug(slug)`. If we already have the `Organization` object (e.g. from `selectMembershipOrganization` or `organizations.findFirstByWorkspaceEmailDomain`), calling `getWorkspaceExperienceBySlug(slug)` creates a redundant database query in `organizations.findBySlug(slug)` since we just fetched it.
+**Action:** When the application layer already holds the `organization` object, bypass `getWorkspaceExperienceBySlug` and call `compileWorkspaceExperience({ slug, organization })` synchronously to save an unnecessary database query. Ensure that we don't access `compiled.organization` as `CompiledWorkspaceExperience` does not return the `organization` property.
diff --git a/lib/application/auth/tenant-access-selection.ts b/lib/application/auth/tenant-access-selection.ts
index 75e45ac..93362ca 100644
--- a/lib/application/auth/tenant-access-selection.ts
+++ b/lib/application/auth/tenant-access-selection.ts
@@ -8,11 +8,11 @@ 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;
-}) {
+}): T | null {
   const requestedSlug = input.requestedSlug?.trim() || null;
 
   for (const membership of input.memberships) {
diff --git a/lib/application/auth/tenant-access.ts b/lib/application/auth/tenant-access.ts
index 09f0d27..f0eaa53 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,10 @@ 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 +128,10 @@ 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 +150,10 @@ 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,