From 53bbf0f1cb0492fdf415ecbda9279cc4a2a483f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BAnar=20Vestmann?=
 <43557895+RunarVestmann@users.noreply.github.com>
Date: Mon, 2 Dec 2024 11:58:46 +0000
Subject: [PATCH] feat(web): Organization pages - Show parent subpage even
 though standalone theme is not set (#17096)

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
---
 apps/web/pages/s/[...slugs]/index.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/web/pages/s/[...slugs]/index.tsx b/apps/web/pages/s/[...slugs]/index.tsx
index 8060f8453d5e..4f6c72f790ee 100644
--- a/apps/web/pages/s/[...slugs]/index.tsx
+++ b/apps/web/pages/s/[...slugs]/index.tsx
@@ -262,13 +262,17 @@ Component.getProps = async (context) => {
       }
     }
 
-    if (isStandaloneTheme) {
+    try {
       return {
         page: {
           type: PageType.STANDALONE_PARENT_SUBPAGE,
           props: await StandaloneParentSubpage.getProps(modifiedContext),
         },
       }
+    } catch (error) {
+      if (!(error instanceof CustomNextError)) {
+        throw error
+      }
     }
 
     return {