diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php
index 48265ce513..0c3a6c988d 100644
--- a/src/Content/Conversation.php
+++ b/src/Content/Conversation.php
@@ -631,10 +631,12 @@ class Conversation
 
 					[$categories, $folders] = $this->item->determineCategoriesTerms($item, local_user());
 
-					if (!empty($item['content-warning']) && $this->pConfig->get(local_user(), 'system', 'disable_cw', false)) {
+					if (!empty($item['title'])) {
+						$title = $item['title'];
+					} elseif (!empty($item['content-warning']) && $this->pConfig->get(local_user(), 'system', 'disable_cw', false)) {
 						$title = ucfirst($item['content-warning']);
 					} else {
-						$title = $item['title'];
+						$title = '';
 					}
 
 					$tmp_item = [
diff --git a/src/Object/Post.php b/src/Object/Post.php
index 253b4b4f18..4e0d8d2389 100644
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -389,10 +389,12 @@ class Post
 
 		list($categories, $folders) = DI::contentItem()->determineCategoriesTerms($item, local_user());
 
-		if (!empty($item['content-warning']) && DI::pConfig()->get(local_user(), 'system', 'disable_cw', false)) {
+		if (!empty($item['title'])) {
+			$title = $item['title'];
+		} elseif (!empty($item['content-warning']) && DI::pConfig()->get(local_user(), 'system', 'disable_cw', false)) {
 			$title = ucfirst($item['content-warning']);
 		} else {
-			$title = $item['title'];
+			$title = '';
 		}
 
 		if (DI::pConfig()->get(local_user(), 'system', 'hide_dislike')) {