diff --git a/src/Content/OEmbed.php b/src/Content/OEmbed.php
index b0b018c1fb..65b450f51e 100644
--- a/src/Content/OEmbed.php
+++ b/src/Content/OEmbed.php
@@ -162,7 +162,13 @@ class OEmbed
 				$oembed->type = $data['type'];
 
 				if ($oembed->type == 'photo') {
-					$oembed->url = $data['url'];
+					if (!empty($data['images'])) {
+						$oembed->url = $data['images'][0]['src'];
+						$oembed->width = $data['images'][0]['width'];
+						$oembed->height = $data['images'][0]['height'];
+					} else {
+						$oembed->type = 'link';
+					}
 				}
 			}
 
@@ -190,7 +196,7 @@ class OEmbed
 				$oembed->author_url = $data['author_url'];
 			}
 
-			if (!empty($data['images'])) {
+			if (!empty($data['images']) && ($oembed->type != 'photo')) {
 				$oembed->thumbnail_url = $data['images'][0]['src'];
 				$oembed->thumbnail_width = $data['images'][0]['width'];
 				$oembed->thumbnail_height = $data['images'][0]['height'];
diff --git a/src/Util/ParseUrl.php b/src/Util/ParseUrl.php
index 70ae2310f9..683544f448 100644
--- a/src/Util/ParseUrl.php
+++ b/src/Util/ParseUrl.php
@@ -349,6 +349,9 @@ class ParseUrl
 			$siteinfo['title'] = trim($list->item(0)->nodeValue);
 		}
 
+		$twitter_card = false;
+		$twitter_image = false;
+
 		$list = $xpath->query('//meta[@name]');
 		foreach ($list as $node) {
 			$meta_tag = [];
@@ -376,6 +379,7 @@ class ParseUrl
 					break;
 				case 'twitter:image':
 					$siteinfo['image'] = $meta_tag['content'];
+					$twitter_image = true;
 					break;
 				case 'twitter:image:src':
 					$siteinfo['image'] = $meta_tag['content'];
@@ -383,7 +387,7 @@ class ParseUrl
 				case 'twitter:card':
 					// Detect photo pages
 					if ($meta_tag['content'] == 'summary_large_image') {
-						$siteinfo['type'] = 'photo';
+						$twitter_card = true;
 					}
 					break;
 				case 'twitter:description':
@@ -458,6 +462,7 @@ class ParseUrl
 						break;
 					case 'twitter:image':
 						$siteinfo['image'] = $meta_tag['content'];
+						$twitter_image = true;
 						break;
 				}
 			}
@@ -473,8 +478,8 @@ class ParseUrl
 		}
 
 		// Prevent to have a photo type without an image
-		if ((empty($siteinfo['image']) || !empty($siteinfo['text'])) && ($siteinfo['type'] == 'photo')) {
-			$siteinfo['type'] = 'link';
+		if ($twitter_card && $twitter_image && !empty($siteinfo['image'])) {
+			$siteinfo['type'] = 'photo';
 		}
 
 		if (!empty($siteinfo['image'])) {