diff --git a/apps/web/app/settings/(settings-layout)/organizations/attributes/[id]/edit/page.tsx b/apps/web/app/settings/(settings-layout)/organizations/attributes/[id]/edit/page.tsx
index 955d365d78..09c000f874 100644
--- a/apps/web/app/settings/(settings-layout)/organizations/attributes/[id]/edit/page.tsx
+++ b/apps/web/app/settings/(settings-layout)/organizations/attributes/[id]/edit/page.tsx
@@ -8,4 +8,8 @@ export const generateMetadata = async () =>
     (t) => t("edit_attribute_description")
   );
 
-export default OrgAttributesEditPage;
+const OrgAttributesEditPageWrapper = async () => {
+  return <OrgAttributesEditPage />;
+};
+
+export default OrgAttributesEditPageWrapper;
diff --git a/apps/web/app/settings/(settings-layout)/organizations/attributes/create/page.tsx b/apps/web/app/settings/(settings-layout)/organizations/attributes/create/page.tsx
index 5a982ff92c..cb1a29db10 100644
--- a/apps/web/app/settings/(settings-layout)/organizations/attributes/create/page.tsx
+++ b/apps/web/app/settings/(settings-layout)/organizations/attributes/create/page.tsx
@@ -8,4 +8,8 @@ export const generateMetadata = async () =>
     (t) => t("create_attribute_description")
   );
 
-export default OrgAttributesCreatePage;
+const OrgAttributesCreatePageWrapper = async () => {
+  return <OrgAttributesCreatePage />;
+};
+
+export default OrgAttributesCreatePageWrapper;