diff --git a/routes/_components/status/Status.html b/routes/_components/status/Status.html
index 4f0eb903..1e3ff318 100644
--- a/routes/_components/status/Status.html
+++ b/routes/_components/status/Status.html
@@ -21,7 +21,7 @@
   {#if !showContent}
     <StatusMentions {...params} />
   {/if}
-  {#if showContent || contentPreloaded}
+  {#if content && (showContent || contentPreloaded)}
     <StatusContent {...params} shown={showContent}/>
   {/if}
   {#if showMedia }
@@ -223,6 +223,7 @@
         timelineType !== 'search' && 'status-in-timeline',
         isStatusInOwnThread && 'status-in-own-thread'
       )),
+      content: ({ originalStatus }) => originalStatus.content || '',
       showContent: ({ spoilerText, spoilerShown }) => !spoilerText || spoilerShown,
       params: ({ notification, notificationId, status, statusId, timelineType,
         account, accountId, uuid, isStatusInNotification, isStatusInOwnThread,
diff --git a/routes/_components/status/StatusContent.html b/routes/_components/status/StatusContent.html
index 1cd5e6c2..ae2c03d6 100644
--- a/routes/_components/status/StatusContent.html
+++ b/routes/_components/status/StatusContent.html
@@ -79,13 +79,13 @@
           shown && 'shown'
         )
       },
-      content: ({ originalStatus }) => originalStatus.content,
+      content: ({ originalStatus }) => (originalStatus.content || ''),
       emojis: ({ originalStatus }) => originalStatus.emojis,
       massagedContent: ({ content, emojis, $autoplayGifs }) => {
         content = emojifyText(content, emojis, $autoplayGifs)
 
         // GNU Social and Pleroma don't add <p> tags
-        if (!content.startsWith('<p>')) {
+        if (content && !content.startsWith('<p>')) {
           content = `<p>${content}</p>`
         }
         return content