diff --git a/actions/publishToPublication.ts b/actions/publishToPublication.ts
index 8ce771c7..2dd62d89 100644
--- a/actions/publishToPublication.ts
+++ b/actions/publishToPublication.ts
@@ -259,7 +259,7 @@ export async function publishToPublication({
 
     record = {
       $type: "site.standard.document",
-      title: title || "Untitled",
+      title: title || "",
       site: siteUri,
       path: "/" + rkey,
       publishedAt:
@@ -293,7 +293,7 @@ export async function publishToPublication({
           ...preferences,
         },
       }),
-      title: title || "Untitled",
+      title: title || "",
       description: description || "",
       ...(tags !== undefined && { tags }),
       ...(coverImageBlob && { coverImage: coverImageBlob }),
@@ -338,7 +338,7 @@ export async function publishToPublication({
     await supabaseServerClient.from("leaflets_to_documents").upsert({
       leaflet: leaflet_id,
       document: result.uri,
-      title: title || "Untitled",
+      title: title || "",
       description: description || "",
     });
 
diff --git a/app/lish/[did]/[publication]/[rkey]/PostHeader/PostHeader.tsx b/app/lish/[did]/[publication]/[rkey]/PostHeader/PostHeader.tsx
index 1159683a..d6d3da77 100644
--- a/app/lish/[did]/[publication]/[rkey]/PostHeader/PostHeader.tsx
+++ b/app/lish/[did]/[publication]/[rkey]/PostHeader/PostHeader.tsx
@@ -123,11 +123,11 @@ export const PostHeaderLayout = (props: {
       <div className="pubInfo flex text-accent-contrast font-bold justify-between w-full">
         {props.pubLink}
       </div>
-      <h2
-        className={`postTitle text-xl leading-tight pt-0.5 font-bold outline-hidden bg-transparent ${!props.postTitle && "text-tertiary italic"}`}
-      >
-        {props.postTitle ? props.postTitle : "Untitled"}
-      </h2>
+      {props.postTitle && (
+        <h2 className="postTitle text-xl leading-tight pt-0.5 font-bold outline-hidden bg-transparent">
+          {props.postTitle}
+        </h2>
+      )}
       {props.postDescription ? (
         <div className="postDescription italic text-secondary outline-hidden bg-transparent pt-1">
           {props.postDescription}
diff --git a/app/lish/[did]/[publication]/page.tsx b/app/lish/[did]/[publication]/page.tsx
index 6d6e2e31..2655c472 100644
--- a/app/lish/[did]/[publication]/page.tsx
+++ b/app/lish/[did]/[publication]/page.tsx
@@ -20,6 +20,7 @@ import {
   normalizePublicationRecord,
   normalizeDocumentRecord,
 } from "src/utils/normalizeRecords";
+import { getFirstParagraph } from "src/utils/getFirstParagraph";
 
 export default async function Publication(props: {
   params: Promise<{ publication: string; did: string }>;
@@ -143,9 +144,11 @@ export default async function Publication(props: {
                           href={docUrl}
                           className="publishedPost hover:no-underline! flex flex-col"
                         >
-                          <h3 className="text-primary">{doc_record.title}</h3>
-                          <p className="italic text-secondary">
-                            {doc_record.description}
+                          {doc_record.title && (
+                            <h3 className="text-primary">{doc_record.title}</h3>
+                          )}
+                          <p className="italic text-secondary line-clamp-3">
+                            {doc_record.description || getFirstParagraph(doc_record)}
                           </p>
                         </SpeedyLink>
 
diff --git a/components/PostListing.tsx b/components/PostListing.tsx
index 3004461c..6954100e 100644
--- a/components/PostListing.tsx
+++ b/components/PostListing.tsx
@@ -25,6 +25,7 @@ import { mergePreferences } from "src/utils/mergePreferences";
 import { ExternalLinkTiny } from "./Icons/ExternalLinkTiny";
 import { getDocumentURL } from "app/lish/createPub/getPublicationURL";
 import { RecommendButton } from "./RecommendButton";
+import { getFirstParagraph } from "src/utils/getFirstParagraph";
 
 export const PostListing = (props: Post) => {
   let pubRecord = props.publication?.pubRecord as
@@ -133,12 +134,14 @@ export const PostListing = (props: Post) => {
             </div>
           )}
           <div className="postListingInfo px-3 py-2">
-            <h3 className="postListingTitle text-primary line-clamp-2 sm:text-lg text-base">
-              {postRecord.title}
-            </h3>
+            {postRecord.title && (
+              <h3 className="postListingTitle text-primary line-clamp-2 sm:text-lg text-base">
+                {postRecord.title}
+              </h3>
+            )}
 
             <p className="postListingDescription text-secondary line-clamp-3 sm:text-base text-sm">
-              {postRecord.description}
+              {postRecord.description || getFirstParagraph(postRecord)}
             </p>
             <div className="flex flex-col-reverse gap-2 text-sm text-tertiary items-center justify-start pt-1.5 w-full">
               {props.publication && pubRecord && (