diff --git a/api/ssr.js b/api/ssr.js
index 567e5a2f..4a9d60d0 100644
--- a/api/ssr.js
+++ b/api/ssr.js
@@ -5,7 +5,14 @@ export default async function handler(req, res) {
 
   const pageContext = await renderPage({ urlOriginal: url, cookies })
 
-  const { httpResponse } = pageContext
+  const { httpResponse, errorWhileRendering } = pageContext
+
+  if (errorWhileRendering) {
+    console.error(errorWhileRendering)
+    res.statusCode = 500
+    res.end()
+    return
+  }
 
   if (!httpResponse) {
     res.statusCode = 200
diff --git a/src/components/Article/FullArticle.tsx b/src/components/Article/FullArticle.tsx
index 9cd0f253..2d9e8499 100644
--- a/src/components/Article/FullArticle.tsx
+++ b/src/components/Article/FullArticle.tsx
@@ -232,7 +232,7 @@ export const FullArticle = (props: Props) => {
             </Show>
           </article>
           <Show when={isDesktop() && body()}>
-            <TableOfContents variant="article" parentSelector="#shoutBody" />
+            <TableOfContents variant="article" parentSelector="#shoutBody" body={body()} />
           </Show>
         </div>
       </div>
diff --git a/src/components/Editor/Editor.tsx b/src/components/Editor/Editor.tsx
index adddf04b..64cc75b5 100644
--- a/src/components/Editor/Editor.tsx
+++ b/src/components/Editor/Editor.tsx
@@ -248,7 +248,7 @@ export const Editor = (props: Props) => {
     <>
       <div ref={(el) => (editorElRef.current = el)} id="editorBody" />
       <Show when={isDesktop() && html()}>
-        <TableOfContents variant="editor" parentSelector="#editorBody" />
+        <TableOfContents variant="editor" parentSelector="#editorBody" body={html()} />
       </Show>
       <TextBubbleMenu
         isCommonMarkup={isCommonMarkup()}
diff --git a/src/components/TableOfContents/TableOfContents.tsx b/src/components/TableOfContents/TableOfContents.tsx
index 714a9cd4..70af55f8 100644
--- a/src/components/TableOfContents/TableOfContents.tsx
+++ b/src/components/TableOfContents/TableOfContents.tsx
@@ -5,7 +5,7 @@ import { DEFAULT_HEADER_OFFSET } from '../../stores/router'
 
 import { useLocalize } from '../../context/localize'
 
-import { debounce } from 'debounce'
+import debounce from 'debounce'
 
 import { Icon } from '../_shared/Icon'
 
@@ -14,6 +14,7 @@ import styles from './TableOfContents.module.scss'
 interface Props {
   variant: 'article' | 'editor'
   parentSelector: string
+  body: string
 }
 
 const scrollToHeader = (element) => {
@@ -32,21 +33,34 @@ export const TableOfContents = (props: Props) => {
   const [headings, setHeadings] = createSignal<Element[]>([])
   const [areHeadingsLoaded, setAreHeadingsLoaded] = createSignal<boolean>(false)
 
-  const [isVisible, setIsVisible] = createSignal<boolean>(true)
+  const [isVisible, setIsVisible] = createSignal<boolean>(props.variant === 'article')
   const toggleIsVisible = () => {
     setIsVisible((visible) => !visible)
   }
 
-  onMount(() => {
+  const updateHeadings = () => {
     const { parentSelector } = props
+
     // eslint-disable-next-line unicorn/prefer-spread
     setHeadings(Array.from(document.querySelector(parentSelector).querySelectorAll('h2, h3, h4')))
-
     setAreHeadingsLoaded(true)
-  })
+  }
+
+  const debouncedUpdateHeadings = debounce(updateHeadings, 500)
+
+  createEffect(
+    on(
+      () => props.body,
+      () => debouncedUpdateHeadings()
+    )
+  )
 
   return (
-    <Show when={areHeadingsLoaded()}>
+    <Show
+      when={
+        areHeadingsLoaded() && (props.variant === 'article' ? headings().length > 2 : headings().length > 1)
+      }
+    >
       <div
         class={clsx(styles.TableOfContentsFixedWrapper, {
           [styles.TableOfContentsFixedWrapperLefted]: props.variant === 'editor'