diff --git a/app/[leaflet_id]/actions/PublishButton.tsx b/app/[leaflet_id]/actions/PublishButton.tsx
index 093bc3ec..4098d1ff 100644
--- a/app/[leaflet_id]/actions/PublishButton.tsx
+++ b/app/[leaflet_id]/actions/PublishButton.tsx
@@ -176,7 +176,7 @@ const PublishToPublicationButton = (props: { entityID: string }) => {
           <hr className="border-border-light mt-3 mb-2" />
 
           <div className="flex gap-2 items-center place-self-end">
-            {selectedPub !== "looseleaf" && (
+            {selectedPub !== "looseleaf" && selectedPub && (
               <SaveAsDraftButton
                 selectedPub={selectedPub}
                 leafletId={permission_token.id}
diff --git a/app/[leaflet_id]/publish/PublishPost.tsx b/app/[leaflet_id]/publish/PublishPost.tsx
index 7e6c0905..823c2f04 100644
--- a/app/[leaflet_id]/publish/PublishPost.tsx
+++ b/app/[leaflet_id]/publish/PublishPost.tsx
@@ -177,10 +177,14 @@ const PublishPostForm = (
                     <div className="flex flex-col p-2">
                       <div className="font-bold">{props.title}</div>
                       <div className="text-tertiary">{props.description}</div>
-                      <hr className="border-border-light mt-2 mb-1" />
-                      <p className="text-xs text-tertiary">
-                        {props.record?.base_path}
-                      </p>
+                      {props.record && (
+                        <>
+                          <hr className="border-border-light mt-2 mb-1" />
+                          <p className="text-xs text-tertiary">
+                            {props.record?.base_path}
+                          </p>
+                        </>
+                      )}
                     </div>
                   </div>
                   <div className="text-xs text-secondary italic place-self-end pt-2">
diff --git a/components/Pages/Page.tsx b/components/Pages/Page.tsx
index f9c7144f..22d5220d 100644
--- a/components/Pages/Page.tsx
+++ b/components/Pages/Page.tsx
@@ -60,7 +60,7 @@ export function Page(props: {
           />
         }
       >
-        {props.first && (
+        {props.first && pageType === "doc" && (
           <>
             <PublicationMetadata />
           </>