diff --git a/src/Model/Item.php b/src/Model/Item.php
index 863d89790e..4025ec4ffe 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -2684,7 +2684,8 @@ class Item
 	{
 		$leading = '';
 		$trailing = '';
-		foreach (Post\Media::getByURIId($item['uri-id'], [Post\Media::AUDIO, Post\Media::VIDEO,
+		// currently deactivated the request for Post\Media::VIDEO since it creates mutliple videos from Peertube
+		foreach (Post\Media::getByURIId($item['uri-id'], [Post\Media::AUDIO, 
 			Post\Media::DOCUMENT, Post\Media::TORRENT, Post\Media::UNKNOWN]) as $attachment) {
 			if (in_array($attachment['type'], [Post\Media::AUDIO, Post\Media::VIDEO]) && strpos($item['body'], $attachment['url'])) {
 				continue;
diff --git a/src/Util/ParseUrl.php b/src/Util/ParseUrl.php
index 683544f448..9ce9b0e9f9 100644
--- a/src/Util/ParseUrl.php
+++ b/src/Util/ParseUrl.php
@@ -477,10 +477,11 @@ class ParseUrl
 			}
 		}
 
+// Currently deactivated, see https://github.com/friendica/friendica/pull/10148#issuecomment-821512658		
 		// Prevent to have a photo type without an image
-		if ($twitter_card && $twitter_image && !empty($siteinfo['image'])) {
-			$siteinfo['type'] = 'photo';
-		}
+//		if ($twitter_card && $twitter_image && !empty($siteinfo['image'])) {
+//			$siteinfo['type'] = 'photo';
+//		}
 
 		if (!empty($siteinfo['image'])) {
 			$siteinfo['images'] = $siteinfo['images'] ?? [];