diff --git a/website/src/graphql/dailp/index.ts b/website/src/graphql/dailp/index.ts
index 1b2f0d4e..dc2031ca 100644
--- a/website/src/graphql/dailp/index.ts
+++ b/website/src/graphql/dailp/index.ts
@@ -1343,7 +1343,7 @@ export type DocFormFieldsFragment = {
   }
 
 export type ParagraphFormFieldsFragment = {
-  readonly __typename?: "DocumentParagraph"
+  readonly __typename: "DocumentParagraph"
 } & Pick<DocumentParagraph, "id" | "index" | "translation"> & {
     readonly source: ReadonlyArray<
       | ({ readonly __typename: "AnnotatedForm" } & Pick<
@@ -1416,7 +1416,7 @@ export type ParagraphFormFieldsFragment = {
               { readonly __typename?: "Comment" } & Pick<Comment, "id">
             >
           })
-      | { readonly __typename?: "LineBreak" }
+      | { readonly __typename: "LineBreak" }
     >
     readonly comments: ReadonlyArray<
       { readonly __typename?: "Comment" } & Pick<Comment, "id">
@@ -2533,10 +2533,12 @@ export const FormFieldsFragmentDoc = gql`
 `
 export const ParagraphFormFieldsFragmentDoc = gql`
   fragment ParagraphFormFields on DocumentParagraph {
+    __typename
     id
     index
     translation
     source {
+      __typename
       ...FormFields
     }
     comments {
diff --git a/website/src/graphql/dailp/queries.graphql b/website/src/graphql/dailp/queries.graphql
index e099b25c..629f3f9b 100644
--- a/website/src/graphql/dailp/queries.graphql
+++ b/website/src/graphql/dailp/queries.graphql
@@ -130,10 +130,12 @@ fragment DocFormFields on AnnotatedDoc {
 }
 
 fragment ParagraphFormFields on DocumentParagraph {
+  __typename
   id
   index
   translation
   source {
+    __typename
     ...FormFields
   }
   comments {
diff --git a/website/src/panel-layout.tsx b/website/src/panel-layout.tsx
index 47676727..9185700c 100644
--- a/website/src/panel-layout.tsx
+++ b/website/src/panel-layout.tsx
@@ -67,10 +67,6 @@ export const PanelLayout = (p: {
     }
   }, [p.segment, prevSegment, setIsEditing, setIsEditingParagraph])
 
-  if (!p.segment) {
-    return null
-  }
-
   const token = useCredentials()
   const userGroups = useCognitoUserGroups()
 
@@ -106,6 +102,10 @@ export const PanelLayout = (p: {
     }
   )
 
+  if (!p.segment) {
+    return null
+  }
+
   let panel = null
 
   // Display the paragraph panel if the segment type is a word (AnnotatedForm).
@@ -210,7 +210,6 @@ export const PanelLayout = (p: {
               <h1
                 className={css.noSpaceBelow}
               >{`Paragraph ${p.segment.index}`}</h1>
-              <h2 className={css.cherHeader}>{p.segment.source}</h2>
             </header>
           </>
         )}
diff --git a/website/src/paragraph-panel.tsx b/website/src/paragraph-panel.tsx
index 0e5cd1a4..228b56c0 100644
--- a/website/src/paragraph-panel.tsx
+++ b/website/src/paragraph-panel.tsx
@@ -64,9 +64,7 @@ const ParagraphPanel = (p: {
       />
     </Form>
   )
-  const discussionContent = (
-    <CommentSection parent={p.paragraph as TranslatedParagraph} />
-  )
+  const discussionContent = <CommentSection parent={p.paragraph} />
 
   return (
     <>