diff --git a/apps/website/src/app/[lang]/category/[id]/page.tsx b/apps/website/src/app/[lang]/category/[id]/page.tsx
index 22154bd..eb5df08 100644
--- a/apps/website/src/app/[lang]/category/[id]/page.tsx
+++ b/apps/website/src/app/[lang]/category/[id]/page.tsx
@@ -219,15 +219,17 @@ export default async function CategoryPage({ params }: { params: Promise<{ id: s
                 {category._count && <p className="mt-3 text-muted-text text-sm">{category._count.products} products available in this collection</p>}
               </div>
             </div>
-            <div className="relative w-48 h-48 md:w-72 md:h-72 shrink-0 rounded-3xl overflow-hidden shadow-lg border border-line-primary/5">
-              <Image
-                src={categoryThumbnailUrl}
-                alt={categoryName}
-                fill
-                unoptimized
-                className="object-cover"
-              />
-            </div>
+            {categoryThumbnailUrl && (
+              <div className="relative w-48 h-48 md:w-72 md:h-72 shrink-0 rounded-3xl overflow-hidden shadow-lg border border-line-primary/5">
+                <Image
+                  src={categoryThumbnailUrl}
+                  alt={categoryName}
+                  fill
+                  unoptimized
+                  className="object-cover"
+                />
+              </div>
+            )}
           </div>
         </section>
       )}
diff --git a/apps/website/src/lib/cms-sections.ts b/apps/website/src/lib/cms-sections.ts
index 845f58b..59532c3 100644
--- a/apps/website/src/lib/cms-sections.ts
+++ b/apps/website/src/lib/cms-sections.ts
@@ -12,7 +12,7 @@ export function splitCmsLayoutSections(sections: PageSection[]) {
 
   return {
     announcementSections: activeSections.filter((section) => announcementTypes.has(sectionType(section))),
-    heroSections: [], // Keep for backwards compatibility with page components
-    bottomSections: activeSections.filter((section) => !announcementTypes.has(sectionType(section))),
+    heroSections: activeSections.filter((section) => heroTypes.has(sectionType(section))),
+    bottomSections: activeSections.filter((section) => !announcementTypes.has(sectionType(section)) && !heroTypes.has(sectionType(section))),
   }
 }