diff --git a/src/Content/PageInfo.php b/src/Content/PageInfo.php
index 8a2ee9f9d9..39bd35f73a 100644
--- a/src/Content/PageInfo.php
+++ b/src/Content/PageInfo.php
@@ -142,6 +142,10 @@ class PageInfo
 			$text .= " title='" . $data['title'] . "'";
 		}
 
+		if (empty($data['text'])) {
+			$data['text'] = '';
+		}
+
 		// Only embedd a picture link when it seems to be a valid picture ("width" is set)
 		if (!empty($data['images']) && !empty($data['images'][0]['width'])) {
 			$preview = str_replace(['[', ']'], ['[', ']'], htmlentities($data['images'][0]['src'], ENT_QUOTES, 'UTF-8', false));
@@ -163,7 +167,7 @@ class PageInfo
 			}
 		}
 
-		$text .= ']' . $data['text'] ?? '' . '[/attachment]';
+		$text .= ']' . $data['text'] . '[/attachment]';
 
 		$hashtags = '';
 		if (!empty($data['keywords'])) {
diff --git a/src/Object/Post.php b/src/Object/Post.php
index 0de7bd072b..51b952d610 100644
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -977,7 +977,7 @@ class Post
 
 		if ($this->isToplevel()) {
 			if ($conv->getMode() !== 'profile') {
-				if ($this->getDataValue('wall') && !$this->getDataValue('self')) {
+				if ($this->getDataValue('wall') && !$this->getDataValue('self') && !empty($a->page_contact)) {
 					// On the network page, I am the owner. On the display page it will be the profile owner.
 					// This will have been stored in $a->page_contact by our calling page.
 					// Put this person as the wall owner of the wall-to-wall notice.