diff --git a/apps/web/src/app/[locale]/(marketing)/blog/[slug]/page.tsx b/apps/web/src/app/[locale]/(marketing)/blog/[slug]/page.tsx
index 629b8b8..b62c8b0 100644
--- a/apps/web/src/app/[locale]/(marketing)/blog/[slug]/page.tsx
+++ b/apps/web/src/app/[locale]/(marketing)/blog/[slug]/page.tsx
@@ -1,40 +1,39 @@
 import { notFound } from "next/navigation";
-import { getPayload } from "payload";
-import config from "@payload-config";
-import { RichText } from "@payloadcms/richtext-lexical/react";
 
 export const dynamic = "force-dynamic";
 
 type Props = { params: Promise<{ slug: string }> };
 
+async function getPost(slug: string) {
+  try {
+    const { getPayload } = await import("payload");
+    const config = (await import("@payload-config")).default;
+    const payload = await getPayload({ config });
+    const { docs } = await payload.find({
+      collection: "posts",
+      where: { slug: { equals: slug }, status: { equals: "published" } },
+      limit: 1,
+      depth: 2,
+    });
+    return docs[0] ?? null;
+  } catch {
+    return null;
+  }
+}
+
 export async function generateMetadata({ params }: Props) {
   const { slug } = await params;
-  const payload = await getPayload({ config });
-  const { docs } = await payload.find({
-    collection: "posts",
-    where: { slug: { equals: slug }, status: { equals: "published" } },
-    limit: 1,
-    depth: 1,
-  });
-  const post = docs[0];
+  const post = await getPost(slug);
   if (!post) return { title: "Not found — claudemesh" };
   return {
-    title: `${post.title} — claudemesh`,
-    description: post.excerpt || post.seo?.metaDescription || undefined,
+    title: `${(post as any).title} — claudemesh`,
+    description: (post as any).excerpt || undefined,
   };
 }
 
 export default async function BlogPost({ params }: Props) {
   const { slug } = await params;
-  const payload = await getPayload({ config });
-  const { docs } = await payload.find({
-    collection: "posts",
-    where: { slug: { equals: slug }, status: { equals: "published" } },
-    limit: 1,
-    depth: 2,
-  });
-
-  const post = docs[0] as any;
+  const post = await getPost(slug) as any;
   if (!post) notFound();
 
   const author = typeof post.author === "object" ? post.author : null;
@@ -75,7 +74,11 @@ export default async function BlogPost({ params }: Props) {
         className="prose prose-invert max-w-none prose-headings:font-medium prose-a:text-[var(--cm-clay)] prose-a:no-underline hover:prose-a:underline prose-code:text-[var(--cm-fg-secondary)]"
         style={{ fontFamily: "var(--cm-font-serif)" }}
       >
-        {post.content && <RichText data={post.content} />}
+        {post.content && typeof post.content === "string" ? (
+          <div dangerouslySetInnerHTML={{ __html: post.content }} />
+        ) : (
+          <p className="text-[var(--cm-fg-tertiary)]">Content not available.</p>
+        )}
       </div>
     </article>
   );
diff --git a/apps/web/src/app/[locale]/(marketing)/blog/page.tsx b/apps/web/src/app/[locale]/(marketing)/blog/page.tsx
index 0f26fdc..4b2e514 100644
--- a/apps/web/src/app/[locale]/(marketing)/blog/page.tsx
+++ b/apps/web/src/app/[locale]/(marketing)/blog/page.tsx
@@ -1,6 +1,4 @@
 import Link from "next/link";
-import { getPayload } from "payload";
-import config from "@payload-config";
 
 export const dynamic = "force-dynamic";
 
@@ -9,15 +7,26 @@ export const metadata = {
   description: "Engineering notes on peer messaging, protocol design, and multi-agent security.",
 };
 
+async function getPosts() {
+  try {
+    const { getPayload } = await import("payload");
+    const config = (await import("@payload-config")).default;
+    const payload = await getPayload({ config });
+    const { docs } = await payload.find({
+      collection: "posts",
+      where: { status: { equals: "published" } },
+      sort: "-publishedAt",
+      limit: 20,
+      depth: 1,
+    });
+    return docs;
+  } catch {
+    return [];
+  }
+}
+
 export default async function BlogIndex() {
-  const payload = await getPayload({ config });
-  const { docs: posts } = await payload.find({
-    collection: "posts",
-    where: { status: { equals: "published" } },
-    sort: "-publishedAt",
-    limit: 20,
-    depth: 1,
-  });
+  const posts = await getPosts();
 
   return (
     <section className="mx-auto max-w-3xl px-6 py-24 md:py-32">
diff --git a/apps/web/src/app/[locale]/(marketing)/changelog/page.tsx b/apps/web/src/app/[locale]/(marketing)/changelog/page.tsx
index c4869eb..2610dae 100644
--- a/apps/web/src/app/[locale]/(marketing)/changelog/page.tsx
+++ b/apps/web/src/app/[locale]/(marketing)/changelog/page.tsx
@@ -1,6 +1,3 @@
-import { getPayload } from "payload";
-import config from "@payload-config";
-
 export const dynamic = "force-dynamic";
 
 export const metadata = {
@@ -22,13 +19,24 @@ const TYPE_COLORS: Record<string, string> = {
   breaking: "bg-red-500",
 };
 
+async function getChangelog() {
+  try {
+    const { getPayload } = await import("payload");
+    const config = (await import("@payload-config")).default;
+    const payload = await getPayload({ config });
+    const { docs } = await payload.find({
+      collection: "changelog",
+      sort: "-date",
+      limit: 50,
+    });
+    return docs;
+  } catch {
+    return [];
+  }
+}
+
 export default async function ChangelogPage() {
-  const payload = await getPayload({ config });
-  const { docs: entries } = await payload.find({
-    collection: "changelog",
-    sort: "-date",
-    limit: 50,
-  });
+  const entries = await getChangelog();
 
   return (
     <section className="mx-auto max-w-3xl px-6 py-24 md:py-32">