diff --git a/src/components/site/SiteArchives.tsx b/src/components/site/SiteArchives.tsx
index 14bb6f21..74138d1c 100644
--- a/src/components/site/SiteArchives.tsx
+++ b/src/components/site/SiteArchives.tsx
@@ -2,8 +2,11 @@ import Link from "next/link"
 import { formatDate } from "~/lib/date"
 
 export const SiteArchives: React.FC<{
-  posts: { id: string; publishedAt: string; slug: string; title: string }[]
+  posts:
+    | { id: string; publishedAt: string; slug: string; title: string }[]
+    | undefined
 }> = ({ posts }) => {
+  if (!posts) return null
   return (
     <>
       <h2 className="text-xl font-bold page-title">Archives</h2>
diff --git a/src/pages/_site/[site]/[page].tsx b/src/pages/_site/[site]/[page].tsx
index 011842e7..cf14b0a0 100644
--- a/src/pages/_site/[site]/[page].tsx
+++ b/src/pages/_site/[site]/[page].tsx
@@ -20,7 +20,11 @@ export const getServerSideProps: GetServerSideProps = serverSidePropsHandler(
 
     await Promise.all([
       ssg.fetchQuery("site", { site: domainOrSubdomain }),
-      ssg.fetchQuery("site.page", { site: domainOrSubdomain, page: pageSlug }),
+      ssg.fetchQuery("site.page", {
+        site: domainOrSubdomain,
+        page: pageSlug,
+        renderContent: true,
+      }),
     ])
 
     return {
@@ -55,13 +59,11 @@ function SitePagePage({
 
   const site = siteResult.data
   const subscription = subscriptionResult.data
-  const page = pageResult.data
-
-  if (!site || !page) return null
+  const page = pageResult.data!
 
   return (
     <SiteLayout
-      site={site}
+      site={site!}
       title={page.title}
       isLoggedIn={isLoggedIn}
       subscription={subscription}
diff --git a/src/pages/_site/[site]/archives.tsx b/src/pages/_site/[site]/archives.tsx
index 19d6e234..d902a620 100644
--- a/src/pages/_site/[site]/archives.tsx
+++ b/src/pages/_site/[site]/archives.tsx
@@ -53,11 +53,9 @@ function SiteArchivesPage({
   const subscription = subscriptionResult.data
   const posts = postsResult.data?.nodes
 
-  if (!site || !posts) return null
-
   return (
     <SiteLayout
-      site={site}
+      site={site!}
       title="Archives"
       isLoggedIn={isLoggedIn}
       subscription={subscription}