diff --git a/apps/dashboard/src/lib/features/org/api/org.svelte.ts b/apps/dashboard/src/lib/features/org/api/org.svelte.ts
index 2a58287c..be9ebe2d 100644
--- a/apps/dashboard/src/lib/features/org/api/org.svelte.ts
+++ b/apps/dashboard/src/lib/features/org/api/org.svelte.ts
@@ -70,8 +70,11 @@ class OrgApi extends BaseApiWithErrors {
   audiencePagination = $state<OrganizationAudiencePagination | null>(null);
   publicCourses: OrgPublicCourses = $state([]);
   hasMorePublicCourses = $state(false);
+  publicCoursesLoadedSiteName: string | null = $state(null);
 
   isFetchingOrgPublicCourses = $state(false);
+  private activePublicCoursesFetch: Promise<void> | null = null;
+  private activePublicCoursesFetchSiteName: string | null = null;
   private activeAudienceRequestController: AbortController | null = null;
 
   cancelAudienceRequest() {
@@ -155,15 +158,52 @@ class OrgApi extends BaseApiWithErrors {
     return response;
   }
 
+  invalidatePublicCourses() {
+    this.publicCoursesLoadedSiteName = null;
+  }
+
+  /**
+   * Refetches public courses for a site, clearing any cached settings preview data.
+   */
+  async refreshPublicCourses(siteName: string) {
+    if (!siteName) {
+      return;
+    }
+
+    this.invalidatePublicCourses();
+    await this.fetchPublicCoursesBySiteName(siteName);
+  }
+
+  /**
+   * Loads public courses for a site when they have not been fetched yet.
+   * Skips the request when courses are already in memory for the same site.
+   */
+  async loadPublicCoursesIfNeeded(siteName: string) {
+    if (!siteName || this.publicCoursesLoadedSiteName === siteName) {
+      return;
+    }
+
+    await this.fetchPublicCoursesBySiteName(siteName);
+  }
+
   /**
    * Gets public courses by organization siteName (for landing pages)
    * @param siteName Organization site name
    * @returns Published courses array
    */
   async getPublicCoursesBySiteName(siteName: string) {
+    this.invalidatePublicCourses();
+    await this.fetchPublicCoursesBySiteName(siteName);
+  }
+
+  private fetchPublicCoursesBySiteName(siteName: string): Promise<void> {
+    if (this.activePublicCoursesFetch && this.activePublicCoursesFetchSiteName === siteName) {
+      return this.activePublicCoursesFetch;
+    }
+
     this.isFetchingOrgPublicCourses = true;
 
-    await this.execute<GetOrgPublicCoursesRequest>({
+    const fetchPromise = this.execute<GetOrgPublicCoursesRequest>({
       requestFn: () =>
         classroomio.organization.courses.public.$get({
           query: { siteName }
@@ -172,10 +212,29 @@ class OrgApi extends BaseApiWithErrors {
       onSuccess: (response) => {
         this.publicCourses = response.data.courses;
         this.hasMorePublicCourses = response.data.hasMoreCourses;
+        this.publicCoursesLoadedSiteName = siteName;
       }
-    });
+    })
+      .then(() => undefined)
+      .finally(() => {
+        this.isFetchingOrgPublicCourses = false;
 
-    this.isFetchingOrgPublicCourses = false;
+        if (this.publicCoursesLoadedSiteName !== siteName) {
+          this.publicCourses = [];
+          this.hasMorePublicCourses = false;
+          this.publicCoursesLoadedSiteName = siteName;
+        }
+
+        if (this.activePublicCoursesFetchSiteName === siteName) {
+          this.activePublicCoursesFetch = null;
+          this.activePublicCoursesFetchSiteName = null;
+        }
+      });
+
+    this.activePublicCoursesFetch = fetchPromise;
+    this.activePublicCoursesFetchSiteName = siteName;
+
+    return fetchPromise;
   }
 
   /**
diff --git a/apps/dashboard/src/lib/features/org/components/landing-page/landing-page.svelte b/apps/dashboard/src/lib/features/org/components/landing-page/landing-page.svelte
index 5b0ade71..bca0b339 100644
--- a/apps/dashboard/src/lib/features/org/components/landing-page/landing-page.svelte
+++ b/apps/dashboard/src/lib/features/org/components/landing-page/landing-page.svelte
@@ -49,7 +49,8 @@
       normalizeLandingPageSettings(org.landingpage),
       orgApi.publicCourses,
       orgApi.hasMorePublicCourses,
-      authAction
+      authAction,
+      { coursesLoaded: hasLoadedCourses }
     )
   );
 
diff --git a/apps/dashboard/src/lib/features/org/utils/landing-page.ts b/apps/dashboard/src/lib/features/org/utils/landing-page.ts
index 7576f1fb..06866f30 100644
--- a/apps/dashboard/src/lib/features/org/utils/landing-page.ts
+++ b/apps/dashboard/src/lib/features/org/utils/landing-page.ts
@@ -18,6 +18,7 @@ import {
   labelMatchesSocialPlatform,
   resolveFooterSocialPlatform
 } from '@cio/ui/custom/org-landing-page/footer-social-platform';
+import { t } from '$lib/utils/functions/translations';
 
 export const landingPageThemes = [
   'minimal',
@@ -689,12 +690,20 @@ export function mapPublicCoursesToLandingPageCourses(courses: OrgPublicCourses):
   });
 }
 
+export function buildOrgLandingPageLabels(): OrgLandingPageProps['labels'] {
+  return {
+    catalogEmptyTitle: t.get('public_courses.catalog_empty.title'),
+    catalogEmptyDescription: t.get('public_courses.catalog_empty.description')
+  };
+}
+
 export function buildOrgLandingPageProps(
   org: AccountOrg,
   landingpage: unknown,
   courses: OrgPublicCourses,
   hasMoreCourses = false,
-  authAction?: OrgLandingPageProps['authAction']
+  authAction?: OrgLandingPageProps['authAction'],
+  options?: { coursesLoaded?: boolean }
 ): OrgLandingPageProps {
   const normalizedLandingPage = normalizeLandingPageSettings(landingpage);
 
@@ -704,7 +713,9 @@ export function buildOrgLandingPageProps(
     authAction,
     ...normalizedLandingPage,
     courses: mapPublicCoursesToLandingPageCourses(courses),
-    hasMoreCourses
+    hasMoreCourses,
+    coursesLoaded: options?.coursesLoaded ?? true,
+    labels: buildOrgLandingPageLabels()
   };
 }
 
diff --git a/apps/dashboard/src/lib/features/settings/pages/landingpage.svelte b/apps/dashboard/src/lib/features/settings/pages/landingpage.svelte
index 4b844783..3cc4c4c7 100644
--- a/apps/dashboard/src/lib/features/settings/pages/landingpage.svelte
+++ b/apps/dashboard/src/lib/features/settings/pages/landingpage.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import { resolve } from '$app/paths';
+  import { page } from '$app/state';
   import { goto } from '$app/navigation';
   import ArrowRightIcon from '@lucide/svelte/icons/arrow-right';
   import EllipsisVerticalIcon from '@lucide/svelte/icons/ellipsis-vertical';
@@ -134,7 +135,21 @@
       : { label: t.get('navigation.login'), href: '/login' }
   );
 
-  const previewProps = $derived(buildOrgLandingPageProps($currentOrg, normalized, [], false, authAction));
+  const previewSiteName = $derived($currentOrg.siteName || page.params.slug || '');
+
+  const coursesLoaded = $derived(!previewSiteName || orgApi.publicCoursesLoadedSiteName === previewSiteName);
+
+  const previewProps = $derived.by(() =>
+    buildOrgLandingPageProps($currentOrg, normalized, orgApi.publicCourses, orgApi.hasMorePublicCourses, authAction, {
+      coursesLoaded
+    })
+  );
+
+  $effect(() => {
+    if (!previewSiteName) return;
+
+    void orgApi.refreshPublicCourses(previewSiteName);
+  });
 
   const ThemeComponent = $derived(landingPageThemeComponents[currentTheme] ?? landingPageThemeComponents.minimal);
 
diff --git a/apps/dashboard/src/lib/utils/translations/da.json b/apps/dashboard/src/lib/utils/translations/da.json
index 44c23165..583c8602 100644
--- a/apps/dashboard/src/lib/utils/translations/da.json
+++ b/apps/dashboard/src/lib/utils/translations/da.json
@@ -3739,6 +3739,10 @@
       "title": "Ingen kurser fundet",
       "description": "Prøv at rydde dine filtre, eller tjek igen senere."
     },
+    "catalog_empty": {
+      "title": "Ingen kurser udgivet endnu",
+      "description": "Kom snart tilbage for nye programmer."
+    },
     "filters": {
       "title": "Filtrer efter tags",
       "help": "Vælg et eller flere tags for at filtrere kurser",
diff --git a/apps/dashboard/src/lib/utils/translations/de.json b/apps/dashboard/src/lib/utils/translations/de.json
index e00adf98..3ab2327f 100644
--- a/apps/dashboard/src/lib/utils/translations/de.json
+++ b/apps/dashboard/src/lib/utils/translations/de.json
@@ -3739,6 +3739,10 @@
       "title": "Keine Kurse gefunden",
       "description": "Versuchen Sie, Ihre Filter zu löschen, oder schauen Sie später noch einmal vorbei."
     },
+    "catalog_empty": {
+      "title": "Noch keine Kurse veröffentlicht",
+      "description": "Schauen Sie bald wieder vorbei für neue Programme."
+    },
     "filters": {
       "title": "Nach Tags filtern",
       "help": "Wählen Sie einen oder mehrere Tags aus, um Kurse zu filtern",
diff --git a/apps/dashboard/src/lib/utils/translations/en.json b/apps/dashboard/src/lib/utils/translations/en.json
index f95807e0..2bac86b8 100644
--- a/apps/dashboard/src/lib/utils/translations/en.json
+++ b/apps/dashboard/src/lib/utils/translations/en.json
@@ -1231,6 +1231,10 @@
     "empty": {
       "title": "No courses found",
       "description": "Try clearing your filters or check back later."
+    },
+    "catalog_empty": {
+      "title": "No courses published yet",
+      "description": "Check back soon for new programs."
     }
   },
   "org_navigation": {
diff --git a/apps/dashboard/src/lib/utils/translations/es.json b/apps/dashboard/src/lib/utils/translations/es.json
index e234ae5d..9cefa0fc 100644
--- a/apps/dashboard/src/lib/utils/translations/es.json
+++ b/apps/dashboard/src/lib/utils/translations/es.json
@@ -3739,6 +3739,10 @@
       "title": "No se encontraron cursos",
       "description": "Intente borrar sus filtros o vuelva a consultar más tarde."
     },
+    "catalog_empty": {
+      "title": "Aún no hay cursos publicados",
+      "description": "Vuelva pronto para ver nuevos programas."
+    },
     "filters": {
       "title": "Filtrar por etiquetas",
       "help": "Seleccione una o más etiquetas para filtrar cursos",
diff --git a/apps/dashboard/src/lib/utils/translations/fr.json b/apps/dashboard/src/lib/utils/translations/fr.json
index a3b5cfb7..b4060a44 100644
--- a/apps/dashboard/src/lib/utils/translations/fr.json
+++ b/apps/dashboard/src/lib/utils/translations/fr.json
@@ -3739,6 +3739,10 @@
       "title": "Aucun cours trouvé",
       "description": "Essayez de supprimer vos filtres ou revenez plus tard."
     },
+    "catalog_empty": {
+      "title": "Aucun cours publié pour le moment",
+      "description": "Revenez bientôt pour découvrir de nouveaux programmes."
+    },
     "filters": {
       "title": "Filtrer par balises",
       "help": "Sélectionnez une ou plusieurs balises pour filtrer les cours",
diff --git a/apps/dashboard/src/lib/utils/translations/hi.json b/apps/dashboard/src/lib/utils/translations/hi.json
index 37a3e2d4..a2d25416 100644
--- a/apps/dashboard/src/lib/utils/translations/hi.json
+++ b/apps/dashboard/src/lib/utils/translations/hi.json
@@ -3739,6 +3739,10 @@
       "title": "कोई पाठ्यक्रम नहीं मिला",
       "description": "अपने फ़िल्टर साफ़ करने का प्रयास करें या बाद में दोबारा जाँचें।"
     },
+    "catalog_empty": {
+      "title": "अभी तक कोई पाठ्यक्रम प्रकाशित नहीं हुआ",
+      "description": "नए कार्यक्रमों के लिए जल्द ही वापस आएँ।"
+    },
     "filters": {
       "title": "टैग द्वारा फ़िल्टर करें",
       "help": "पाठ्यक्रमों को फ़िल्टर करने के लिए एक या अधिक टैग चुनें",
diff --git a/apps/dashboard/src/lib/utils/translations/pl.json b/apps/dashboard/src/lib/utils/translations/pl.json
index 84e51724..05eb8f60 100644
--- a/apps/dashboard/src/lib/utils/translations/pl.json
+++ b/apps/dashboard/src/lib/utils/translations/pl.json
@@ -3739,6 +3739,10 @@
       "title": "Nie znaleziono kursów",
       "description": "Spróbuj wyczyścić filtry lub sprawdź później."
     },
+    "catalog_empty": {
+      "title": "Brak opublikowanych kursów",
+      "description": "Wróć wkrótce po nowe programy."
+    },
     "filters": {
       "title": "Filtruj według tagów",
       "help": "Wybierz jeden lub więcej tagów, aby filtrować kursy",
diff --git a/apps/dashboard/src/lib/utils/translations/pt.json b/apps/dashboard/src/lib/utils/translations/pt.json
index 953e9c17..6fdc4475 100644
--- a/apps/dashboard/src/lib/utils/translations/pt.json
+++ b/apps/dashboard/src/lib/utils/translations/pt.json
@@ -3739,6 +3739,10 @@
       "title": "Nenhum curso encontrado",
       "description": "Tente limpar os filtros ou volte mais tarde."
     },
+    "catalog_empty": {
+      "title": "Nenhum curso publicado ainda",
+      "description": "Volte em breve para novos programas."
+    },
     "filters": {
       "title": "Filtrar por tags",
       "help": "Selecione uma ou mais tags para filtrar cursos",
diff --git a/apps/dashboard/src/lib/utils/translations/ru.json b/apps/dashboard/src/lib/utils/translations/ru.json
index 3442c5ca..c84d5a20 100644
--- a/apps/dashboard/src/lib/utils/translations/ru.json
+++ b/apps/dashboard/src/lib/utils/translations/ru.json
@@ -3739,6 +3739,10 @@
       "title": "Курсы не найдены",
       "description": "Попробуйте очистить фильтры или зайдите позже."
     },
+    "catalog_empty": {
+      "title": "Пока нет опубликованных курсов",
+      "description": "Загляните позже — скоро появятся новые программы."
+    },
     "filters": {
       "title": "Фильтровать по тегам",
       "help": "Выберите один или несколько тегов, чтобы отфильтровать курсы.",
diff --git a/apps/dashboard/src/lib/utils/translations/vi.json b/apps/dashboard/src/lib/utils/translations/vi.json
index 4a9df202..80c7a11d 100644
--- a/apps/dashboard/src/lib/utils/translations/vi.json
+++ b/apps/dashboard/src/lib/utils/translations/vi.json
@@ -3739,6 +3739,10 @@
       "title": "Không tìm thấy khóa học nào",
       "description": "Hãy thử xóa bộ lọc của bạn hoặc kiểm tra lại sau."
     },
+    "catalog_empty": {
+      "title": "Chưa có khóa học nào được xuất bản",
+      "description": "Hãy quay lại sớm để xem các chương trình mới."
+    },
     "filters": {
       "title": "Lọc theo thẻ",
       "help": "Chọn một hoặc nhiều thẻ để lọc các khóa học",
diff --git a/apps/dashboard/src/routes/(app)/org/[slug]/settings/landingpage/edit/+page.svelte b/apps/dashboard/src/routes/(app)/org/[slug]/settings/landingpage/edit/+page.svelte
index 4cb45cd8..43217d98 100644
--- a/apps/dashboard/src/routes/(app)/org/[slug]/settings/landingpage/edit/+page.svelte
+++ b/apps/dashboard/src/routes/(app)/org/[slug]/settings/landingpage/edit/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { fly } from 'svelte/transition';
-  import { onMount, type Component } from 'svelte';
+  import type { Component } from 'svelte';
   import { resolve } from '$app/paths';
   import { page } from '$app/state';
   import { goto } from '$app/navigation';
@@ -90,24 +90,27 @@
         }
   );
 
-  const previewProps = $derived(
+  const previewSiteName = $derived($currentOrg.siteName || page.params.slug || '');
+
+  const coursesLoaded = $derived(!previewSiteName || orgApi.publicCoursesLoadedSiteName === previewSiteName);
+
+  const previewProps = $derived.by(() =>
     buildOrgLandingPageProps(
       $currentOrg,
       previewLandingPageSettings,
       orgApi.publicCourses,
       orgApi.hasMorePublicCourses,
-      authAction
+      authAction,
+      { coursesLoaded }
     )
   );
 
   const ThemeComponent = $derived(landingPageThemeComponents[previewTheme] ?? landingPageThemeComponents.minimal);
 
-  onMount(() => {
-    if ($currentOrg.siteName) {
-      orgApi.publicCourses = [];
-      orgApi.hasMorePublicCourses = false;
-      void orgApi.getPublicCoursesBySiteName($currentOrg.siteName);
-    }
+  $effect(() => {
+    if (!previewSiteName) return;
+
+    void orgApi.loadPublicCoursesIfNeeded(previewSiteName);
   });
 
   $effect(() => {
diff --git a/packages/ui/src/custom/org-landing-page/bold/org.svelte b/packages/ui/src/custom/org-landing-page/bold/org.svelte
index 90a32074..b1fed212 100644
--- a/packages/ui/src/custom/org-landing-page/bold/org.svelte
+++ b/packages/ui/src/custom/org-landing-page/bold/org.svelte
@@ -7,6 +7,7 @@
   import BoldNav from './nav.svelte';
   import BoldHero from './hero.svelte';
   import BoldCourseCard from './course-card.svelte';
+  import OrgLandingPageCoursesEmpty from '../courses-empty.svelte';
   import { Button } from '../../../base/button';
   import { DotPattern } from '../../animation/dot-pattern';
   import { themeStyle } from '../theme-style';
@@ -19,6 +20,7 @@
     hero,
     courses,
     hasMoreCourses = false,
+    coursesLoaded = true,
     disableCourseLinks = false,
     embed,
     callout,
@@ -43,23 +45,27 @@
         <div class="ui:flex ui:items-end ui:justify-between ui:mb-12">
           <h2 class="ui:text-4xl ui:font-black ui:tracking-tight">{labels?.catalogHeading ?? 'Latest Courses'}</h2>
         </div>
-        <div class="ui:grid ui:grid-cols-1 ui:md:grid-cols-2 ui:gap-8">
-          {#each courses as course, index (course.id)}
-            <BoldCourseCard {course} {disableCourseLinks} {labels} />
-          {/each}
-        </div>
-
-        {#if hasMoreCourses}
-          <div class="ui:mt-12 ui:flex ui:justify-center">
-            <Button
-              href={disableCourseLinks ? undefined : '/courses'}
-              size="lg"
-              class="ui:rounded-xl ui:px-8"
-              disabled={disableCourseLinks}
-            >
-              {labels?.browseCoursesLabel ?? 'View more courses'}
-            </Button>
+        {#if coursesLoaded && courses.length === 0}
+          <OrgLandingPageCoursesEmpty {labels} />
+        {:else}
+          <div class="ui:grid ui:grid-cols-1 ui:md:grid-cols-2 ui:gap-8">
+            {#each courses as course, index (course.id)}
+              <BoldCourseCard {course} {disableCourseLinks} {labels} />
+            {/each}
           </div>
+
+          {#if hasMoreCourses}
+            <div class="ui:mt-12 ui:flex ui:justify-center">
+              <Button
+                href={disableCourseLinks ? undefined : '/courses'}
+                size="lg"
+                class="ui:rounded-xl ui:px-8"
+                disabled={disableCourseLinks}
+              >
+                {labels?.browseCoursesLabel ?? 'View more courses'}
+              </Button>
+            </div>
+          {/if}
         {/if}
       </div>
     </section>
diff --git a/packages/ui/src/custom/org-landing-page/classic/org.svelte b/packages/ui/src/custom/org-landing-page/classic/org.svelte
index bc8f7687..05aba5da 100644
--- a/packages/ui/src/custom/org-landing-page/classic/org.svelte
+++ b/packages/ui/src/custom/org-landing-page/classic/org.svelte
@@ -7,6 +7,7 @@
   import ClassicNav from './nav.svelte';
   import ClassicHero from './hero.svelte';
   import ClassicCourseCard from './course-card.svelte';
+  import OrgLandingPageCoursesEmpty from '../courses-empty.svelte';
   import { Button } from '../../../base/button';
   import { themeStyle } from '../theme-style';
 
@@ -18,6 +19,7 @@
     hero,
     courses,
     hasMoreCourses = false,
+    coursesLoaded = true,
     disableCourseLinks = false,
     embed,
     callout,
@@ -44,24 +46,28 @@
         <div class="ui:mt-6 ui:h-px ui:w-24 ui:bg-[var(--landing-border)] ui:mx-auto"></div>
       </div>
 
-      <div class="ui:grid ui:grid-cols-1 ui:sm:grid-cols-2 ui:lg:grid-cols-3 ui:gap-8 ui:justify-items-center">
-        {#each courses as course, index (course.id)}
-          <ClassicCourseCard {course} {disableCourseLinks} {labels} />
-        {/each}
-      </div>
-
-      {#if hasMoreCourses}
-        <div class="ui:mt-12 ui:flex ui:justify-center">
-          <Button
-            href={disableCourseLinks ? undefined : '/courses'}
-            variant="outline"
-            size="lg"
-            class="ui:px-8"
-            disabled={disableCourseLinks}
-          >
-            {labels?.browseCoursesLabel ?? 'View more courses'}
-          </Button>
+      {#if coursesLoaded && courses.length === 0}
+        <OrgLandingPageCoursesEmpty {labels} />
+      {:else}
+        <div class="ui:grid ui:grid-cols-1 ui:sm:grid-cols-2 ui:lg:grid-cols-3 ui:gap-8 ui:justify-items-center">
+          {#each courses as course, index (course.id)}
+            <ClassicCourseCard {course} {disableCourseLinks} {labels} />
+          {/each}
         </div>
+
+        {#if hasMoreCourses}
+          <div class="ui:mt-12 ui:flex ui:justify-center">
+            <Button
+              href={disableCourseLinks ? undefined : '/courses'}
+              variant="outline"
+              size="lg"
+              class="ui:px-8"
+              disabled={disableCourseLinks}
+            >
+              {labels?.browseCoursesLabel ?? 'View more courses'}
+            </Button>
+          </div>
+        {/if}
       {/if}
     </section>
   </main>
diff --git a/packages/ui/src/custom/org-landing-page/corporate/org.svelte b/packages/ui/src/custom/org-landing-page/corporate/org.svelte
index 372ac0d2..d51048fd 100644
--- a/packages/ui/src/custom/org-landing-page/corporate/org.svelte
+++ b/packages/ui/src/custom/org-landing-page/corporate/org.svelte
@@ -7,6 +7,7 @@
   import CorporateNav from './nav.svelte';
   import CorporateHero from './hero.svelte';
   import CorporateCourseCard from './course-card.svelte';
+  import OrgLandingPageCoursesEmpty from '../courses-empty.svelte';
   import { Button } from '../../../base/button';
   import { themeStyle } from '../theme-style';
 
@@ -18,6 +19,7 @@
     hero,
     courses,
     hasMoreCourses = false,
+    coursesLoaded = true,
     disableCourseLinks = false,
     embed,
     callout,
@@ -38,32 +40,32 @@
       {/snippet}
     </CorporateHero>
 
-    {#if courses.length > 0}
-      <section class="ui:py-24 ui:px-6 ui:border-t ui:border-[var(--landing-border)]">
-        <div class="ui:max-w-[1120px] ui:mx-auto">
-          <div class="ui:flex ui:items-end ui:justify-between ui:flex-wrap ui:gap-4 ui:mb-10">
-            <div>
-              <p
-                class="ui:text-xs ui:font-semibold ui:tracking-widest ui:uppercase ui:text-[var(--landing-fg)] ui:mb-3"
-              >
-                {labels?.catalogEyebrow ?? 'Catalog'}
-              </p>
-              <h2 class="ui:text-3xl ui:lg:text-4xl ui:font-semibold ui:tracking-tight ui:m-0 ui:max-w-xl">
-                {labels?.catalogHeading ?? 'Courses your teams are taking'}
-              </h2>
-            </div>
-            {#if hasMoreCourses}
-              <Button
-                href={disableCourseLinks ? undefined : '/courses'}
-                variant="outline"
-                class="ui:rounded-none ui:font-medium"
-                disabled={disableCourseLinks}
-              >
-                {labels?.browseCoursesLabel ?? 'Browse catalog →'}
-              </Button>
-            {/if}
+    <section class="ui:py-24 ui:px-6 ui:border-t ui:border-[var(--landing-border)]">
+      <div class="ui:max-w-[1120px] ui:mx-auto">
+        <div class="ui:flex ui:items-end ui:justify-between ui:flex-wrap ui:gap-4 ui:mb-10">
+          <div>
+            <p class="ui:text-xs ui:font-semibold ui:tracking-widest ui:uppercase ui:text-[var(--landing-fg)] ui:mb-3">
+              {labels?.catalogEyebrow ?? 'Catalog'}
+            </p>
+            <h2 class="ui:text-3xl ui:lg:text-4xl ui:font-semibold ui:tracking-tight ui:m-0 ui:max-w-xl">
+              {labels?.catalogHeading ?? 'Courses your teams are taking'}
+            </h2>
           </div>
+          {#if hasMoreCourses && courses.length > 0}
+            <Button
+              href={disableCourseLinks ? undefined : '/courses'}
+              variant="outline"
+              class="ui:rounded-none ui:font-medium"
+              disabled={disableCourseLinks}
+            >
+              {labels?.browseCoursesLabel ?? 'Browse catalog →'}
+            </Button>
+          {/if}
+        </div>
 
+        {#if coursesLoaded && courses.length === 0}
+          <OrgLandingPageCoursesEmpty {labels} />
+        {:else}
           <div
             class="ui:grid ui:grid-cols-1 ui:md:grid-cols-2 ui:lg:grid-cols-3 ui:border-t ui:border-l ui:border-[var(--landing-border)]"
           >
@@ -71,9 +73,9 @@
               <CorporateCourseCard {course} {disableCourseLinks} {labels} />
             {/each}
           </div>
-        </div>
-      </section>
-    {/if}
+        {/if}
+      </div>
+    </section>
   </main>
 
   <OrgLandingPageLinks {links} {labels} variant="corporate" />
diff --git a/packages/ui/src/custom/org-landing-page/courses-empty.svelte b/packages/ui/src/custom/org-landing-page/courses-empty.svelte
new file mode 100644
index 00000000..3fe0396f
--- /dev/null
+++ b/packages/ui/src/custom/org-landing-page/courses-empty.svelte
@@ -0,0 +1,28 @@
+<script lang="ts">
+  import LibraryBigIcon from '@lucide/svelte/icons/library-big';
+  import { Empty } from '../empty';
+  import type { OrgLandingPageLabels } from './types';
+
+  interface Props {
+    labels?: OrgLandingPageLabels;
+    class?: string;
+  }
+
+  let { labels, class: className = '' }: Props = $props();
+
+  const title = $derived(labels?.catalogEmptyTitle ?? 'No courses published yet');
+  const description = $derived(labels?.catalogEmptyDescription ?? 'Check back soon for new programs.');
+</script>
+
+<div
+  class="ui:[&_[data-slot=empty-title]]:text-[var(--landing-fg)] ui:[&_[data-slot=empty-description]]:text-[var(--landing-fg-muted)] {className}"
+>
+  <Empty
+    icon={LibraryBigIcon}
+    {title}
+    {description}
+    variant="page"
+    class="ui:border-[var(--landing-border)] ui:bg-[var(--landing-card-soft)]/40"
+    iconClass="ui:text-[var(--landing-fg-muted)]"
+  />
+</div>
diff --git a/packages/ui/src/custom/org-landing-page/editorial/org.svelte b/packages/ui/src/custom/org-landing-page/editorial/org.svelte
index efe69f77..96dd8ccd 100644
--- a/packages/ui/src/custom/org-landing-page/editorial/org.svelte
+++ b/packages/ui/src/custom/org-landing-page/editorial/org.svelte
@@ -7,6 +7,7 @@
   import EditorialNav from './nav.svelte';
   import EditorialHero from './hero.svelte';
   import EditorialCourseCard from './course-card.svelte';
+  import OrgLandingPageCoursesEmpty from '../courses-empty.svelte';
   import { themeStyle } from '../theme-style';
   import { Button } from '../../../base/button';
   import { getCourseTypeLandingMeta } from '../landing-page-utils';
@@ -19,6 +20,7 @@
     hero,
     courses,
     hasMoreCourses = false,
+    coursesLoaded = true,
     disableCourseLinks = false,
     embed,
     callout,
@@ -96,37 +98,39 @@
       {/snippet}
     </EditorialHero>
 
-    {#if courses.length > 0}
-      <section id="courses" class="ui:py-10 ui:px-6 ui:md:px-8 ui:bg-[var(--landing-bg)]">
-        <div class="ui:max-w-[1240px] ui:mx-auto">
-          <div class="ui:flex ui:flex-col ui:md:flex-row ui:md:items-end ui:justify-between ui:gap-6 ui:mb-8">
-            <div>
-              <p class="ui:text-[13px] ui:m-0 ui:mb-2 ui:text-[var(--landing-fg-muted)]">
-                {labels?.catalogEyebrow ?? 'Catalog'}
-              </p>
-              <h2
-                class="ui:text-3xl ui:md:text-[40px] ui:font-medium ui:tracking-tight ui:m-0 ui:leading-[1.1] ui:text-[var(--landing-fg)]"
-                style="letter-spacing: -0.025em;"
-              >
-                {labels?.catalogHeading ?? 'Courses starting this season.'}
-              </h2>
-              <p class="ui:text-base ui:mt-3 ui:max-w-xl ui:m-0 ui:text-[var(--landing-fg-muted)]">
-                {labels?.catalogDescription ??
-                  'Cohort-based and self-paced — every course ends with a reviewed project and a certificate of completion.'}
-              </p>
-            </div>
-            {#if hasMoreCourses}
-              <Button
-                href={disableCourseLinks ? undefined : '/courses'}
-                variant="outline"
-                class="ui:rounded-full ui:px-5 ui:font-medium ui:bg-transparent ui:border-[var(--landing-border)] ui:text-[var(--landing-fg)] ui:hover:bg-[var(--landing-bg-section)]"
-                disabled={disableCourseLinks}
-              >
-                {labels?.browseCoursesLabel ?? 'Browse all courses →'}
-              </Button>
-            {/if}
+    <section id="courses" class="ui:py-10 ui:px-6 ui:md:px-8 ui:bg-[var(--landing-bg)]">
+      <div class="ui:max-w-[1240px] ui:mx-auto">
+        <div class="ui:flex ui:flex-col ui:md:flex-row ui:md:items-end ui:justify-between ui:gap-6 ui:mb-8">
+          <div>
+            <p class="ui:text-[13px] ui:m-0 ui:mb-2 ui:text-[var(--landing-fg-muted)]">
+              {labels?.catalogEyebrow ?? 'Catalog'}
+            </p>
+            <h2
+              class="ui:text-3xl ui:md:text-[40px] ui:font-medium ui:tracking-tight ui:m-0 ui:leading-[1.1] ui:text-[var(--landing-fg)]"
+              style="letter-spacing: -0.025em;"
+            >
+              {labels?.catalogHeading ?? 'Courses starting this season.'}
+            </h2>
+            <p class="ui:text-base ui:mt-3 ui:max-w-xl ui:m-0 ui:text-[var(--landing-fg-muted)]">
+              {labels?.catalogDescription ??
+                'Cohort-based and self-paced — every course ends with a reviewed project and a certificate of completion.'}
+            </p>
           </div>
+          {#if hasMoreCourses && courses.length > 0}
+            <Button
+              href={disableCourseLinks ? undefined : '/courses'}
+              variant="outline"
+              class="ui:rounded-full ui:px-5 ui:font-medium ui:bg-transparent ui:border-[var(--landing-border)] ui:text-[var(--landing-fg)] ui:hover:bg-[var(--landing-bg-section)]"
+              disabled={disableCourseLinks}
+            >
+              {labels?.browseCoursesLabel ?? 'Browse all courses →'}
+            </Button>
+          {/if}
+        </div>
 
+        {#if coursesLoaded && courses.length === 0}
+          <OrgLandingPageCoursesEmpty {labels} />
+        {:else}
           {#if visibleFilterDefs.length > 1}
             <div class="ui:flex ui:flex-wrap ui:items-center ui:gap-1.5 ui:mb-8">
               {#each visibleFilterDefs as def (def.key)}
@@ -169,9 +173,9 @@
               </Button>
             </div>
           {/if}
-        </div>
-      </section>
-    {/if}
+        {/if}
+      </div>
+    </section>
   </main>
 
   <OrgLandingPageLinks {links} {labels} variant="editorial" />
diff --git a/packages/ui/src/custom/org-landing-page/index.ts b/packages/ui/src/custom/org-landing-page/index.ts
index dfabbbc7..be653e00 100644
--- a/packages/ui/src/custom/org-landing-page/index.ts
+++ b/packages/ui/src/custom/org-landing-page/index.ts
@@ -69,6 +69,7 @@ export {
   courseCard as VibrantLandingCourseCard
 } from './vibrant';
 
+export { default as OrgLandingPageCoursesEmpty } from './courses-empty.svelte';
 export { default as LandingButton } from './landing-button.svelte';
 export { default as OrgLandingPageEmbed } from './embed.svelte';
 export { default as OrgLandingPageCallout } from './callout.svelte';
diff --git a/packages/ui/src/custom/org-landing-page/minimal/org.svelte b/packages/ui/src/custom/org-landing-page/minimal/org.svelte
index d026312a..4c4f2298 100644
--- a/packages/ui/src/custom/org-landing-page/minimal/org.svelte
+++ b/packages/ui/src/custom/org-landing-page/minimal/org.svelte
@@ -7,6 +7,7 @@
   import MinimalNav from './nav.svelte';
   import MinimalHero from './hero.svelte';
   import MinimalCourseCard from './course-card.svelte';
+  import OrgLandingPageCoursesEmpty from '../courses-empty.svelte';
   import { Button } from '../../../base/button';
   import { themeStyle } from '../theme-style';
 
@@ -18,6 +19,7 @@
     hero,
     courses,
     hasMoreCourses = false,
+    coursesLoaded = true,
     disableCourseLinks = false,
     embed,
     callout,
@@ -41,23 +43,27 @@
     <section class="ui:py-20 ui:px-4">
       <div class="ui:max-w-[1200px] ui:mx-auto">
         <h2 class="ui:text-2xl ui:font-semibold ui:mb-8">{labels?.catalogHeading ?? 'Our Courses'}</h2>
-        <div class="ui:grid ui:grid-cols-1 ui:md:grid-cols-2 ui:gap-6">
-          {#each courses as course, index (course.id)}
-            <MinimalCourseCard {course} {disableCourseLinks} {labels} />
-          {/each}
-        </div>
-
-        {#if hasMoreCourses}
-          <div class="ui:mt-10 ui:flex ui:justify-center">
-            <Button
-              href={disableCourseLinks ? undefined : '/courses'}
-              variant="outline"
-              size="lg"
-              disabled={disableCourseLinks}
-            >
-              {labels?.browseCoursesLabel ?? 'View more courses'}
-            </Button>
+        {#if coursesLoaded && courses.length === 0}
+          <OrgLandingPageCoursesEmpty {labels} />
+        {:else}
+          <div class="ui:grid ui:grid-cols-1 ui:md:grid-cols-2 ui:gap-6">
+            {#each courses as course, index (course.id)}
+              <MinimalCourseCard {course} {disableCourseLinks} {labels} />
+            {/each}
           </div>
+
+          {#if hasMoreCourses}
+            <div class="ui:mt-10 ui:flex ui:justify-center">
+              <Button
+                href={disableCourseLinks ? undefined : '/courses'}
+                variant="outline"
+                size="lg"
+                disabled={disableCourseLinks}
+              >
+                {labels?.browseCoursesLabel ?? 'View more courses'}
+              </Button>
+            </div>
+          {/if}
         {/if}
       </div>
     </section>
diff --git a/packages/ui/src/custom/org-landing-page/saas/org.svelte b/packages/ui/src/custom/org-landing-page/saas/org.svelte
index 84944599..9f59293c 100644
--- a/packages/ui/src/custom/org-landing-page/saas/org.svelte
+++ b/packages/ui/src/custom/org-landing-page/saas/org.svelte
@@ -7,6 +7,7 @@
   import SaasNav from './nav.svelte';
   import SaasHero from './hero.svelte';
   import SaasCourseCard from './course-card.svelte';
+  import OrgLandingPageCoursesEmpty from '../courses-empty.svelte';
   import { Button } from '../../../base/button';
   import { themeStyle } from '../theme-style';
 
@@ -18,6 +19,7 @@
     hero,
     courses,
     hasMoreCourses = false,
+    coursesLoaded = true,
     disableCourseLinks = false,
     embed,
     callout,
@@ -38,44 +40,46 @@
       {/snippet}
     </SaasHero>
 
-    {#if courses.length > 0}
-      <div class="plus-row"></div>
+    <div class="plus-row"></div>
 
-      <section class="ui:py-12 ui:md:py-20 ui:px-4 ui:md:px-6">
-        <div class="ui:max-w-[1180px] ui:mx-auto">
-          <div
-            class="ui:flex ui:flex-col ui:md:flex-row ui:md:items-end ui:md:justify-between ui:gap-4 ui:mb-8 ui:md:mb-12"
-          >
-            <div>
-              <p
-                class="ui:text-xs ui:font-semibold ui:tracking-widest ui:uppercase ui:text-[var(--landing-accent)] ui:mb-3"
-              >
-                {labels?.catalogEyebrow ?? 'Catalog'}
-              </p>
-              <h2 class="ui:text-3xl ui:md:text-4xl ui:font-bold ui:tracking-tight">
-                {labels?.catalogHeading ?? 'Featured courses.'}
-              </h2>
-            </div>
-            {#if hasMoreCourses}
-              <Button
-                href={disableCourseLinks ? undefined : '/courses'}
-                variant="outline"
-                class="ui:rounded-full ui:self-start ui:md:self-auto"
-                disabled={disableCourseLinks}
-              >
-                {labels?.browseCoursesLabel ?? 'Browse catalog'}
-              </Button>
-            {/if}
+    <section class="ui:py-12 ui:md:py-20 ui:px-4 ui:md:px-6">
+      <div class="ui:max-w-[1180px] ui:mx-auto">
+        <div
+          class="ui:flex ui:flex-col ui:md:flex-row ui:md:items-end ui:md:justify-between ui:gap-4 ui:mb-8 ui:md:mb-12"
+        >
+          <div>
+            <p
+              class="ui:text-xs ui:font-semibold ui:tracking-widest ui:uppercase ui:text-[var(--landing-accent)] ui:mb-3"
+            >
+              {labels?.catalogEyebrow ?? 'Catalog'}
+            </p>
+            <h2 class="ui:text-3xl ui:md:text-4xl ui:font-bold ui:tracking-tight">
+              {labels?.catalogHeading ?? 'Featured courses.'}
+            </h2>
           </div>
+          {#if hasMoreCourses && courses.length > 0}
+            <Button
+              href={disableCourseLinks ? undefined : '/courses'}
+              variant="outline"
+              class="ui:rounded-full ui:self-start ui:md:self-auto"
+              disabled={disableCourseLinks}
+            >
+              {labels?.browseCoursesLabel ?? 'Browse catalog'}
+            </Button>
+          {/if}
+        </div>
 
+        {#if coursesLoaded && courses.length === 0}
+          <OrgLandingPageCoursesEmpty {labels} />
+        {:else}
           <div class="course-grid ui:relative">
             {#each courses as course, index (course.id)}
               <SaasCourseCard {course} {disableCourseLinks} {labels} />
             {/each}
           </div>
-        </div>
-      </section>
-    {/if}
+        {/if}
+      </div>
+    </section>
 
     {#if links && links.cards.length > 0}
       <div class="plus-row"></div>
diff --git a/packages/ui/src/custom/org-landing-page/studio/org.svelte b/packages/ui/src/custom/org-landing-page/studio/org.svelte
index 4db903da..da1483fe 100644
--- a/packages/ui/src/custom/org-landing-page/studio/org.svelte
+++ b/packages/ui/src/custom/org-landing-page/studio/org.svelte
@@ -7,6 +7,7 @@
   import StudioNav from './nav.svelte';
   import StudioHero from './hero.svelte';
   import StudioCourseCard from './course-card.svelte';
+  import OrgLandingPageCoursesEmpty from '../courses-empty.svelte';
   import { Button } from '../../../base/button';
   import { themeStyle } from '../theme-style';
 
@@ -18,6 +19,7 @@
     hero,
     courses,
     hasMoreCourses = false,
+    coursesLoaded = true,
     disableCourseLinks = false,
     embed,
     callout,
@@ -38,41 +40,43 @@
       {/snippet}
     </StudioHero>
 
-    {#if courses.length > 0}
-      <section class="ui:py-24 ui:px-6 ui:border-t ui:border-[var(--landing-border)]">
-        <div class="ui:max-w-[1080px] ui:mx-auto">
-          <div class="ui:grid ui:grid-cols-1 ui:md:grid-cols-2 ui:gap-12 ui:items-end ui:mb-12">
-            <div>
-              <p class="ui:text-sm ui:text-[var(--landing-fg-muted)] ui:mb-1.5 ui:inline-flex ui:items-center ui:gap-2">
-                <span class="ui:size-1.5 ui:rounded-full ui:bg-[var(--landing-accent)]"></span>
-                {labels?.catalogEyebrow ?? 'Catalog'}
-              </p>
-              <h2 class="ui:text-3xl ui:lg:text-4xl ui:font-semibold ui:tracking-tight ui:m-0">
-                {labels?.catalogHeading ?? 'Courses your team can actually finish.'}
-              </h2>
-            </div>
-            {#if hasMoreCourses}
-              <div class="ui:flex ui:justify-start ui:md:justify-end">
-                <Button
-                  href={disableCourseLinks ? undefined : '/courses'}
-                  variant="outline"
-                  class="ui:rounded-md"
-                  disabled={disableCourseLinks}
-                >
-                  {labels?.browseCoursesLabel ?? 'Browse all →'}
-                </Button>
-              </div>
-            {/if}
+    <section class="ui:py-24 ui:px-6 ui:border-t ui:border-[var(--landing-border)]">
+      <div class="ui:max-w-[1080px] ui:mx-auto">
+        <div class="ui:grid ui:grid-cols-1 ui:md:grid-cols-2 ui:gap-12 ui:items-end ui:mb-12">
+          <div>
+            <p class="ui:text-sm ui:text-[var(--landing-fg-muted)] ui:mb-1.5 ui:inline-flex ui:items-center ui:gap-2">
+              <span class="ui:size-1.5 ui:rounded-full ui:bg-[var(--landing-accent)]"></span>
+              {labels?.catalogEyebrow ?? 'Catalog'}
+            </p>
+            <h2 class="ui:text-3xl ui:lg:text-4xl ui:font-semibold ui:tracking-tight ui:m-0">
+              {labels?.catalogHeading ?? 'Courses your team can actually finish.'}
+            </h2>
           </div>
+          {#if hasMoreCourses && courses.length > 0}
+            <div class="ui:flex ui:justify-start ui:md:justify-end">
+              <Button
+                href={disableCourseLinks ? undefined : '/courses'}
+                variant="outline"
+                class="ui:rounded-md"
+                disabled={disableCourseLinks}
+              >
+                {labels?.browseCoursesLabel ?? 'Browse all →'}
+              </Button>
+            </div>
+          {/if}
+        </div>
 
+        {#if coursesLoaded && courses.length === 0}
+          <OrgLandingPageCoursesEmpty {labels} />
+        {:else}
           <div class="ui:grid ui:grid-cols-1 ui:md:grid-cols-2 ui:lg:grid-cols-3 ui:gap-3">
             {#each courses as course, index (course.id)}
               <StudioCourseCard {course} {disableCourseLinks} {labels} />
             {/each}
           </div>
-        </div>
-      </section>
-    {/if}
+        {/if}
+      </div>
+    </section>
   </main>
 
   <OrgLandingPageLinks {links} {labels} variant="studio" />
diff --git a/packages/ui/src/custom/org-landing-page/tech/org.svelte b/packages/ui/src/custom/org-landing-page/tech/org.svelte
index f431e320..97131e02 100644
--- a/packages/ui/src/custom/org-landing-page/tech/org.svelte
+++ b/packages/ui/src/custom/org-landing-page/tech/org.svelte
@@ -7,6 +7,7 @@
   import TechNav from './nav.svelte';
   import TechHero from './hero.svelte';
   import TechCourseCard from './course-card.svelte';
+  import OrgLandingPageCoursesEmpty from '../courses-empty.svelte';
   import { Button } from '../../../base/button';
   import { themeStyle } from '../theme-style';
 
@@ -18,6 +19,7 @@
     hero,
     courses,
     hasMoreCourses = false,
+    coursesLoaded = true,
     disableCourseLinks = false,
     embed,
     callout,
@@ -38,32 +40,32 @@
       {/snippet}
     </TechHero>
 
-    {#if courses.length > 0}
-      <section class="ui:py-24 ui:px-6">
-        <div class="ui:max-w-[1280px] ui:mx-auto">
-          <div class="ui:flex ui:items-end ui:justify-between ui:flex-wrap ui:gap-4 ui:mb-14">
-            <div>
-              <p
-                class="ui:font-mono ui:text-xs ui:tracking-widest ui:uppercase ui:text-[var(--landing-accent)] ui:mb-3"
-              >
-                {labels?.catalogEyebrow ?? '// catalog'}
-              </p>
-              <h2 class="ui:text-4xl ui:lg:text-5xl ui:font-extrabold ui:tracking-tight ui:m-0">
-                {labels?.catalogHeading ?? 'Latest courses'}
-              </h2>
-            </div>
-            {#if hasMoreCourses}
-              <Button
-                href={disableCourseLinks ? undefined : '/courses'}
-                variant="outline"
-                class="ui:rounded-none ui:font-mono ui:text-sm"
-                disabled={disableCourseLinks}
-              >
-                {labels?.browseCoursesLabel ?? 'view all →'}
-              </Button>
-            {/if}
+    <section class="ui:py-24 ui:px-6">
+      <div class="ui:max-w-[1280px] ui:mx-auto">
+        <div class="ui:flex ui:items-end ui:justify-between ui:flex-wrap ui:gap-4 ui:mb-14">
+          <div>
+            <p class="ui:font-mono ui:text-xs ui:tracking-widest ui:uppercase ui:text-[var(--landing-accent)] ui:mb-3">
+              {labels?.catalogEyebrow ?? '// catalog'}
+            </p>
+            <h2 class="ui:text-4xl ui:lg:text-5xl ui:font-extrabold ui:tracking-tight ui:m-0">
+              {labels?.catalogHeading ?? 'Latest courses'}
+            </h2>
           </div>
+          {#if hasMoreCourses && courses.length > 0}
+            <Button
+              href={disableCourseLinks ? undefined : '/courses'}
+              variant="outline"
+              class="ui:rounded-none ui:font-mono ui:text-sm"
+              disabled={disableCourseLinks}
+            >
+              {labels?.browseCoursesLabel ?? 'view all →'}
+            </Button>
+          {/if}
+        </div>
 
+        {#if coursesLoaded && courses.length === 0}
+          <OrgLandingPageCoursesEmpty {labels} />
+        {:else}
           <div
             class="ui:grid ui:grid-cols-1 ui:md:grid-cols-2 ui:lg:grid-cols-3 ui:border-t ui:border-l ui:border-[var(--landing-border)]"
           >
@@ -71,9 +73,9 @@
               <TechCourseCard {course} {disableCourseLinks} {labels} />
             {/each}
           </div>
-        </div>
-      </section>
-    {/if}
+        {/if}
+      </div>
+    </section>
   </main>
 
   <OrgLandingPageLinks {links} {labels} variant="tech" />
diff --git a/packages/ui/src/custom/org-landing-page/terminal/org.svelte b/packages/ui/src/custom/org-landing-page/terminal/org.svelte
index 05361395..fab0eb04 100644
--- a/packages/ui/src/custom/org-landing-page/terminal/org.svelte
+++ b/packages/ui/src/custom/org-landing-page/terminal/org.svelte
@@ -7,6 +7,7 @@
   import TerminalNav from './nav.svelte';
   import TerminalHero from './hero.svelte';
   import TerminalCourseCard from './course-card.svelte';
+  import OrgLandingPageCoursesEmpty from '../courses-empty.svelte';
   import { Button } from '../../../base/button';
   import { themeStyle } from '../theme-style';
   import { getCourseTypeLandingMeta } from '../landing-page-utils';
@@ -19,6 +20,7 @@
     hero,
     courses,
     hasMoreCourses = false,
+    coursesLoaded = true,
     disableCourseLinks = false,
     embed,
     callout,
@@ -81,34 +83,36 @@
       {/snippet}
     </TerminalHero>
 
-    {#if courses.length > 0}
-      <section
-        class="ui:py-24 ui:px-6 ui:bg-[var(--landing-bg)]"
-        style="border-top: 1px solid var(--landing-border-soft);"
-      >
-        <div class="ui:max-w-[1120px] ui:mx-auto">
-          <p
-            class="ui:font-mono ui:text-[11px] ui:tracking-[0.12em] ui:uppercase ui:mb-3 ui:inline-flex ui:items-center ui:gap-2"
-            style="color: var(--landing-accent);"
-          >
-            <span
-              class="ui:size-1.5 ui:rounded-full"
-              style="background: var(--landing-accent); box-shadow: 0 0 12px var(--landing-accent);"
-            ></span>
-            {labels?.catalogEyebrow ?? 'Catalog'}
-          </p>
+    <section
+      class="ui:py-24 ui:px-6 ui:bg-[var(--landing-bg)]"
+      style="border-top: 1px solid var(--landing-border-soft);"
+    >
+      <div class="ui:max-w-[1120px] ui:mx-auto">
+        <p
+          class="ui:font-mono ui:text-[11px] ui:tracking-[0.12em] ui:uppercase ui:mb-3 ui:inline-flex ui:items-center ui:gap-2"
+          style="color: var(--landing-accent);"
+        >
+          <span
+            class="ui:size-1.5 ui:rounded-full"
+            style="background: var(--landing-accent); box-shadow: 0 0 12px var(--landing-accent);"
+          ></span>
+          {labels?.catalogEyebrow ?? 'Catalog'}
+        </p>
 
-          <h2
-            class="ui:text-4xl ui:lg:text-[40px] ui:font-semibold ui:tracking-tight ui:leading-[1.08] ui:m-0 ui:mb-3 ui:max-w-[700px] ui:text-[var(--landing-fg)]"
-          >
-            {labels?.catalogHeading ?? 'Courses your team can actually finish.'}
-          </h2>
+        <h2
+          class="ui:text-4xl ui:lg:text-[40px] ui:font-semibold ui:tracking-tight ui:leading-[1.08] ui:m-0 ui:mb-3 ui:max-w-[700px] ui:text-[var(--landing-fg)]"
+        >
+          {labels?.catalogHeading ?? 'Courses your team can actually finish.'}
+        </h2>
 
-          <p class="ui:text-[15px] ui:max-w-xl ui:m-0 ui:mb-8 ui:text-[var(--landing-fg-muted)]">
-            {labels?.catalogDescription ??
-              'Tracks built around real-world artifacts — pull requests, postmortems, and runbooks. No filler.'}
-          </p>
+        <p class="ui:text-[15px] ui:max-w-xl ui:m-0 ui:mb-8 ui:text-[var(--landing-fg-muted)]">
+          {labels?.catalogDescription ??
+            'Tracks built around real-world artifacts — pull requests, postmortems, and runbooks. No filler.'}
+        </p>
 
+        {#if coursesLoaded && courses.length === 0}
+          <OrgLandingPageCoursesEmpty {labels} />
+        {:else}
           {#if tabs.length > 1}
             <div
               class="ui:inline-flex ui:items-center ui:gap-0.5 ui:p-1 ui:rounded-full ui:mb-8 ui:bg-[var(--landing-card)]"
@@ -151,9 +155,9 @@
               </Button>
             </div>
           {/if}
-        </div>
-      </section>
-    {/if}
+        {/if}
+      </div>
+    </section>
   </main>
 
   <OrgLandingPageLinks {links} {labels} variant="terminal" />
diff --git a/packages/ui/src/custom/org-landing-page/types.ts b/packages/ui/src/custom/org-landing-page/types.ts
index 7013f8d3..3cc70261 100644
--- a/packages/ui/src/custom/org-landing-page/types.ts
+++ b/packages/ui/src/custom/org-landing-page/types.ts
@@ -178,6 +178,10 @@ export interface OrgLandingPageLabels {
   calloutEyebrow?: string;
   /** Card footer CTA on the resources/links section. Default per template ("Learn more", "Visit"). Separate from the existing per-template `boldVisitLabel` / `classicLearnMoreLabel` on `LandingPageLinks`, which still apply to those specific templates. */
   learnMoreLabel?: string;
+  /** Empty catalog title when no courses are published. Default: "No courses published yet". */
+  catalogEmptyTitle?: string;
+  /** Empty catalog description when no courses are published. Default: "Check back soon for new programs." */
+  catalogEmptyDescription?: string;
 }
 
 export type CourseCurriculumLesson = {
@@ -342,6 +346,8 @@ export interface OrgLandingPageProps {
   };
   courses: CourseItem[];
   hasMoreCourses?: boolean;
+  /** When false, templates suppress the empty catalog state while courses are still loading. */
+  coursesLoaded?: boolean;
   disableCourseLinks?: boolean;
   embed?: LandingPageEmbed;
   callout?: LandingPageCallout;
diff --git a/packages/ui/src/custom/org-landing-page/vibrant/org.svelte b/packages/ui/src/custom/org-landing-page/vibrant/org.svelte
index 0299f5bc..27d7f359 100644
--- a/packages/ui/src/custom/org-landing-page/vibrant/org.svelte
+++ b/packages/ui/src/custom/org-landing-page/vibrant/org.svelte
@@ -7,6 +7,7 @@
   import VibrantNav from './nav.svelte';
   import VibrantHero from './hero.svelte';
   import VibrantCourseCard from './course-card.svelte';
+  import OrgLandingPageCoursesEmpty from '../courses-empty.svelte';
   import { themeStyle } from '../theme-style';
   import { Button } from '../../../base/button';
   import { getCourseTypeLandingMeta, defaultLessonsLabel, defaultExercisesLabel } from '../landing-page-utils';
@@ -19,6 +20,7 @@
     hero,
     courses,
     hasMoreCourses = false,
+    coursesLoaded = true,
     disableCourseLinks = false,
     embed,
     callout,
@@ -56,153 +58,161 @@
       {/snippet}
     </VibrantHero>
 
-    {#if featured}
-      <section
-        class="ui:bg-[var(--landing-accent)] ui:text-[var(--landing-accent-fg)] ui:px-6 ui:md:px-8 ui:py-24 ui:md:py-32"
-      >
+    {#if coursesLoaded && courses.length === 0}
+      <section id="courses" class="ui:px-6 ui:md:px-8 ui:py-24 ui:md:py-28 ui:bg-[var(--landing-bg)]">
         <div class="ui:max-w-[1320px] ui:mx-auto">
-          <div class="ui:grid ui:grid-cols-1 ui:lg:grid-cols-[1.15fr_1fr] ui:gap-12 ui:lg:gap-20 ui:items-center">
-            <div>
-              {#if featuredTypeMeta}
-                <span
-                  class="ui:inline-flex ui:items-center ui:gap-1.5 ui:rounded-full ui:px-3 ui:py-1 ui:text-[13px] ui:font-medium ui:mb-6 ui:text-[var(--landing-accent-fg)]"
-                  style="background: rgba(255,255,255,0.18);"
+          <OrgLandingPageCoursesEmpty {labels} />
+        </div>
+      </section>
+    {:else}
+      {#if featured}
+        <section
+          class="ui:bg-[var(--landing-accent)] ui:text-[var(--landing-accent-fg)] ui:px-6 ui:md:px-8 ui:py-24 ui:md:py-32"
+        >
+          <div class="ui:max-w-[1320px] ui:mx-auto">
+            <div class="ui:grid ui:grid-cols-1 ui:lg:grid-cols-[1.15fr_1fr] ui:gap-12 ui:lg:gap-20 ui:items-center">
+              <div>
+                {#if featuredTypeMeta}
+                  <span
+                    class="ui:inline-flex ui:items-center ui:gap-1.5 ui:rounded-full ui:px-3 ui:py-1 ui:text-[13px] ui:font-medium ui:mb-6 ui:text-[var(--landing-accent-fg)]"
+                    style="background: rgba(255,255,255,0.18);"
+                  >
+                    {labels?.featuredLabel ?? 'Featured'} · {featuredTypeMeta.label}
+                  </span>
+                {/if}
+                <h2
+                  class="ui:text-4xl ui:md:text-5xl ui:lg:text-[56px] ui:font-medium ui:tracking-tight ui:m-0 ui:mb-6 ui:max-w-[520px]"
+                  style="line-height: 1.05; letter-spacing: -0.025em;"
                 >
-                  {labels?.featuredLabel ?? 'Featured'} · {featuredTypeMeta.label}
-                </span>
-              {/if}
-              <h2
-                class="ui:text-4xl ui:md:text-5xl ui:lg:text-[56px] ui:font-medium ui:tracking-tight ui:m-0 ui:mb-6 ui:max-w-[520px]"
-                style="line-height: 1.05; letter-spacing: -0.025em;"
-              >
-                {featured.title}
-              </h2>
-              <p class="ui:text-lg ui:m-0 ui:mb-4 ui:max-w-[480px] ui:opacity-90" style="line-height: 1.5;">
-                {featured.description}
-              </p>
-              <div
-                class="ui:flex ui:flex-wrap ui:items-center ui:gap-x-5 ui:gap-y-2 ui:text-[14.5px] ui:mb-8 ui:opacity-85"
-              >
-                {#if featured.lessonCount}
-                  <span>{resolvedLessonsLabel(featured.lessonCount)}</span>
-                {/if}
-                {#if featured.exerciseCount}
-                  <span aria-hidden="true">·</span>
-                  <span>{resolvedExercisesLabel(featured.exerciseCount)}</span>
-                {/if}
-                {#if featured.duration}
-                  <span aria-hidden="true">·</span>
-                  <span>{featured.duration}</span>
-                {/if}
-              </div>
-              <div class="ui:flex ui:flex-wrap ui:items-center ui:gap-3">
-                <Button
-                  href={courseHref(featured)}
-                  disabled={disableCourseLinks}
-                  class="ui:rounded-md ui:px-6 ui:py-3 ui:text-base ui:font-medium ui:bg-[var(--landing-bg)] ui:text-[var(--landing-fg)] ui:hover:opacity-90"
+                  {featured.title}
+                </h2>
+                <p class="ui:text-lg ui:m-0 ui:mb-4 ui:max-w-[480px] ui:opacity-90" style="line-height: 1.5;">
+                  {featured.description}
+                </p>
+                <div
+                  class="ui:flex ui:flex-wrap ui:items-center ui:gap-x-5 ui:gap-y-2 ui:text-[14.5px] ui:mb-8 ui:opacity-85"
                 >
-                  {labels?.startCourseLabel ?? 'Start this course'}
-                </Button>
-                <span class="ui:text-base ui:font-medium ui:opacity-95">
-                  {featured.price || formatCost(featured.cost, featured.currency)}
-                </span>
+                  {#if featured.lessonCount}
+                    <span>{resolvedLessonsLabel(featured.lessonCount)}</span>
+                  {/if}
+                  {#if featured.exerciseCount}
+                    <span aria-hidden="true">·</span>
+                    <span>{resolvedExercisesLabel(featured.exerciseCount)}</span>
+                  {/if}
+                  {#if featured.duration}
+                    <span aria-hidden="true">·</span>
+                    <span>{featured.duration}</span>
+                  {/if}
+                </div>
+                <div class="ui:flex ui:flex-wrap ui:items-center ui:gap-3">
+                  <Button
+                    href={courseHref(featured)}
+                    disabled={disableCourseLinks}
+                    class="ui:rounded-md ui:px-6 ui:py-3 ui:text-base ui:font-medium ui:bg-[var(--landing-bg)] ui:text-[var(--landing-fg)] ui:hover:opacity-90"
+                  >
+                    {labels?.startCourseLabel ?? 'Start this course'}
+                  </Button>
+                  <span class="ui:text-base ui:font-medium ui:opacity-95">
+                    {featured.price || formatCost(featured.cost, featured.currency)}
+                  </span>
+                </div>
               </div>
-            </div>
 
-            <div
-              class="ui:relative ui:overflow-hidden ui:rounded-3xl ui:h-[440px] ui:md:h-[480px]"
-              style="
+              <div
+                class="ui:relative ui:overflow-hidden ui:rounded-3xl ui:h-[440px] ui:md:h-[480px]"
+                style="
                 background:
                   radial-gradient(50% 60% at 40% 40%, rgba(255,255,255,0.55) 0%, transparent 70%),
                   radial-gradient(60% 70% at 70% 65%, rgba(255,255,255,0.32) 0%, transparent 70%),
                   radial-gradient(40% 50% at 25% 75%, rgba(255,235,210,0.5) 0%, transparent 70%),
                   linear-gradient(135deg, #b0a8a0 0%, #d4cabd 50%, #c8c0b5 100%);
               "
-            >
-              <div
-                class="ui:absolute ui:left-1/2 ui:top-1/2 ui:w-[80%] ui:overflow-hidden ui:rounded-2xl ui:p-6"
-                style="
+              >
+                <div
+                  class="ui:absolute ui:left-1/2 ui:top-1/2 ui:w-[80%] ui:overflow-hidden ui:rounded-2xl ui:p-6"
+                  style="
                   transform: translate(-50%, -50%);
                   background: #0c1320;
                   color: #fff;
                   box-shadow: 0 30px 60px -20px rgba(0,0,0,0.35);
                 "
-              >
-                <p class="ui:m-0 ui:mb-1 ui:text-[16px] ui:font-semibold">Course outline</p>
-                <p class="ui:m-0 ui:mb-5 ui:text-[13px]" style="color: #8a93a0;">
-                  Pick up where you left off — anytime.
-                </p>
-                <div class="ui:flex ui:flex-col ui:gap-2">
-                  {#each Array.from({ length: Math.min(featured.lessonCount ?? 4, 4) }) as _, idx (idx)}
-                    <div
-                      class="ui:flex ui:items-center ui:gap-3 ui:rounded-lg ui:px-3.5 ui:py-3"
-                      style="background: #131c2c;"
-                    >
-                      <span
-                        class="ui:inline-flex ui:items-center ui:justify-center ui:size-6 ui:rounded ui:text-[11px] ui:font-semibold ui:tabular-nums"
-                        style="background: #2a3548; color: #fff;"
+                >
+                  <p class="ui:m-0 ui:mb-1 ui:text-[16px] ui:font-semibold">Course outline</p>
+                  <p class="ui:m-0 ui:mb-5 ui:text-[13px]" style="color: #8a93a0;">
+                    Pick up where you left off — anytime.
+                  </p>
+                  <div class="ui:flex ui:flex-col ui:gap-2">
+                    {#each Array.from({ length: Math.min(featured.lessonCount ?? 4, 4) }) as _, idx (idx)}
+                      <div
+                        class="ui:flex ui:items-center ui:gap-3 ui:rounded-lg ui:px-3.5 ui:py-3"
+                        style="background: #131c2c;"
                       >
-                        {String(idx + 1).padStart(2, '0')}
-                      </span>
-                      <span class="ui:flex-1 ui:text-[13.5px] ui:font-medium" style="color: #fff;">
-                        {idx === 0
-                          ? 'Foundations & setup'
-                          : idx === 1
-                            ? 'Core concepts'
-                            : idx === 2
-                              ? 'Hands-on practice'
-                              : 'Capstone project'}
-                      </span>
-                      <span class="ui:text-[11.5px] ui:tabular-nums" style="color: #6c7585;">
-                        {idx === 0 ? '42 min' : idx === 1 ? '1h 12m' : idx === 2 ? '58 min' : '2h 30m'}
-                      </span>
-                    </div>
-                  {/each}
+                        <span
+                          class="ui:inline-flex ui:items-center ui:justify-center ui:size-6 ui:rounded ui:text-[11px] ui:font-semibold ui:tabular-nums"
+                          style="background: #2a3548; color: #fff;"
+                        >
+                          {String(idx + 1).padStart(2, '0')}
+                        </span>
+                        <span class="ui:flex-1 ui:text-[13.5px] ui:font-medium" style="color: #fff;">
+                          {idx === 0
+                            ? 'Foundations & setup'
+                            : idx === 1
+                              ? 'Core concepts'
+                              : idx === 2
+                                ? 'Hands-on practice'
+                                : 'Capstone project'}
+                        </span>
+                        <span class="ui:text-[11.5px] ui:tabular-nums" style="color: #6c7585;">
+                          {idx === 0 ? '42 min' : idx === 1 ? '1h 12m' : idx === 2 ? '58 min' : '2h 30m'}
+                        </span>
+                      </div>
+                    {/each}
+                  </div>
                 </div>
               </div>
             </div>
           </div>
-        </div>
-      </section>
-    {/if}
+        </section>
+      {/if}
 
-    {#if remainingCourses.length > 0 || (!featured && courses.length > 0)}
-      {@const catalogCourses = featured ? remainingCourses : courses}
-      <section id="courses" class="ui:px-6 ui:md:px-8 ui:py-24 ui:md:py-28 ui:bg-[var(--landing-bg)]">
-        <div class="ui:max-w-[1320px] ui:mx-auto">
-          <div class="ui:flex ui:flex-col ui:md:flex-row ui:md:items-end ui:justify-between ui:gap-6 ui:mb-12">
-            <div>
-              <p
-                class="ui:text-[13px] ui:font-medium ui:tracking-[0.08em] ui:uppercase ui:text-[var(--landing-fg-muted)] ui:m-0 ui:mb-3"
-              >
-                {labels?.catalogEyebrow ?? 'Catalog'}
-              </p>
-              <h2
-                class="ui:text-4xl ui:md:text-5xl ui:font-medium ui:tracking-tight ui:m-0 ui:text-[var(--landing-fg)] ui:max-w-2xl"
-                style="line-height: 1.05; letter-spacing: -0.025em;"
-              >
-                {labels?.catalogHeading ?? 'More courses to take next.'}
-              </h2>
+      {#if remainingCourses.length > 0 || (!featured && courses.length > 0)}
+        {@const catalogCourses = featured ? remainingCourses : courses}
+        <section id="courses" class="ui:px-6 ui:md:px-8 ui:py-24 ui:md:py-28 ui:bg-[var(--landing-bg)]">
+          <div class="ui:max-w-[1320px] ui:mx-auto">
+            <div class="ui:flex ui:flex-col ui:md:flex-row ui:md:items-end ui:justify-between ui:gap-6 ui:mb-12">
+              <div>
+                <p
+                  class="ui:text-[13px] ui:font-medium ui:tracking-[0.08em] ui:uppercase ui:text-[var(--landing-fg-muted)] ui:m-0 ui:mb-3"
+                >
+                  {labels?.catalogEyebrow ?? 'Catalog'}
+                </p>
+                <h2
+                  class="ui:text-4xl ui:md:text-5xl ui:font-medium ui:tracking-tight ui:m-0 ui:text-[var(--landing-fg)] ui:max-w-2xl"
+                  style="line-height: 1.05; letter-spacing: -0.025em;"
+                >
+                  {labels?.catalogHeading ?? 'More courses to take next.'}
+                </h2>
+              </div>
+              {#if hasMoreCourses}
+                <Button
+                  href={disableCourseLinks ? undefined : '/courses'}
+                  variant="outline"
+                  class="ui:rounded-md ui:px-5 ui:py-2.5 ui:font-medium ui:border-[var(--landing-border)] ui:text-[var(--landing-fg)] ui:hover:bg-[var(--landing-card-soft)]"
+                  disabled={disableCourseLinks}
+                >
+                  {labels?.browseCoursesLabel ?? 'Browse all →'}
+                </Button>
+              {/if}
             </div>
-            {#if hasMoreCourses}
-              <Button
-                href={disableCourseLinks ? undefined : '/courses'}
-                variant="outline"
-                class="ui:rounded-md ui:px-5 ui:py-2.5 ui:font-medium ui:border-[var(--landing-border)] ui:text-[var(--landing-fg)] ui:hover:bg-[var(--landing-card-soft)]"
-                disabled={disableCourseLinks}
-              >
-                {labels?.browseCoursesLabel ?? 'Browse all →'}
-              </Button>
-            {/if}
-          </div>
 
-          <div class="ui:grid ui:grid-cols-1 ui:md:grid-cols-2 ui:lg:grid-cols-3 ui:gap-5">
-            {#each catalogCourses as course, index (course.id)}
-              <VibrantCourseCard {course} {disableCourseLinks} {labels} />
-            {/each}
+            <div class="ui:grid ui:grid-cols-1 ui:md:grid-cols-2 ui:lg:grid-cols-3 ui:gap-5">
+              {#each catalogCourses as course, index (course.id)}
+                <VibrantCourseCard {course} {disableCourseLinks} {labels} />
+              {/each}
+            </div>
           </div>
-        </div>
-      </section>
+        </section>
+      {/if}
     {/if}
   </main>