diff --git a/src/Model/Event.php b/src/Model/Event.php
index 5d71dd16a..06d391745 100644
--- a/src/Model/Event.php
+++ b/src/Model/Event.php
@@ -672,9 +672,6 @@ class Event
 		}
 
 		$event['author-link'] = Contact::magicLink($event['author-link']);
-		$event['summary']     = BBCode::convertForUriId($event['uri-id'], Strings::escapeHtml($event['summary']));
-		$event['desc']        = BBCode::convertForUriId($event['uri-id'], Strings::escapeHtml($event['desc']));
-		$event['location']    = BBCode::convertForUriId($event['uri-id'], Strings::escapeHtml($event['location']));
 
 		return [
 			'id'     => $event['id'],
diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index 26395cb4d..a1690648f 100644
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -451,6 +451,10 @@ class Profile
 
 		$p['url'] = Contact::magicLinkById($cid, $profile['url']);
 
+		if (!isset($profile['hidewall'])) {
+			Logger::warning('Missing hidewall key in profile array', ['profile' => $profile, 'callstack' => System::callstack(10)]);
+		}
+
 		$tpl = Renderer::getMarkupTemplate('profile/vcard.tpl');
 		$o .= Renderer::replaceMacros($tpl, [
 			'$profile' => $p,
@@ -461,7 +465,7 @@ class Profile
 			'$unfollow' => DI::l10n()->t('Unfollow'),
 			'$unfollow_link' => $unfollow_link,
 			'$subscribe_feed' => DI::l10n()->t('Atom feed'),
-			'$subscribe_feed_link' => $profile['hidewall'] ? '' : $profile['poll'],
+			'$subscribe_feed_link' => $profile['hidewall'] ?? 0 ? '' : $profile['poll'],
 			'$wallmessage' => DI::l10n()->t('Message'),
 			'$wallmessage_link' => $wallmessage_link,
 			'$account_type' => $account_type,