diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index 825a2412a..c481423a6 100644
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -211,6 +211,11 @@ class Processor
 		$item['title'] = HTML::toBBCode($activity['name']);
 		$item['content-warning'] = HTML::toBBCode($activity['summary']);
 		$item['body'] = self::convertMentions(HTML::toBBCode($activity['content']));
+
+		if (($activity['object_type'] == 'as:Video') && !empty($activity['alternate-url'])) {
+			$item['body'] .= "\n[video]" . $activity['alternate-url'] . '[/video]';
+		}
+
 		$item['location'] = $activity['location'];
 
 		if (!empty($item['latitude']) && !empty($item['longitude'])) {
diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php
index 5e6269472..04da5fa59 100644
--- a/src/Protocol/ActivityPub/Receiver.php
+++ b/src/Protocol/ActivityPub/Receiver.php
@@ -698,10 +698,10 @@ class Receiver
 
 		// Special treatment for Hubzilla links
 		if (is_array($object_data['alternate-url'])) {
-			if (!empty($object['as:url'])) {
+			$object_data['alternate-url'] = JsonLD::fetchElement($object_data['alternate-url'], 'as:href');
+
+			if (!is_string($object_data['alternate-url'])) {
 				$object_data['alternate-url'] = JsonLD::fetchElement($object['as:url'], 'as:href');
-			} else {
-				$object_data['alternate-url'] = null;
 			}
 		}