diff --git a/src/api/status.ts b/src/api/status.ts
index f4b9652..1374899 100644
--- a/src/api/status.ts
+++ b/src/api/status.ts
@@ -130,6 +130,8 @@ const populateTweetProperties = async (
         apiTweet.twitter_card = 'player';
         apiTweet.media.videos = apiTweet.media.videos || [];
         apiTweet.media.videos.push(mediaObject);
+      } else {
+        console.log('Unknown media type', mediaObject.type);
       }
     }
   });
@@ -284,6 +286,10 @@ export const statusAPI = async (
   const quoteTweet = tweet.quoted_status_result;
   if (quoteTweet) {
     apiTweet.quote = (await populateTweetProperties(quoteTweet, res, language)) as APITweet;
+    /* Only override the twitter_card if it's a basic tweet, since media always takes precedence  */
+    if (apiTweet.twitter_card === 'tweet') {
+      apiTweet.twitter_card = apiTweet.quote.twitter_card;
+    }
   }
 
   /* Finally, staple the Tweet to the response and return it */
diff --git a/src/embed/status.ts b/src/embed/status.ts
index 2b95d37..92ece7a 100644
--- a/src/embed/status.ts
+++ b/src/embed/status.ts
@@ -344,12 +344,14 @@ export const handleStatus = async (
      and we have to pretend to be Medium in order to get working IV, but haven't figured if the template is causing issues.  */
   const text = useIV ? sanitizeText(newText).replace(/\n/g, '<br>') : sanitizeText(newText);
 
+  const useCard = tweet.twitter_card === 'tweet' ? tweet.quote?.twitter_card : tweet.twitter_card;
+
   /* Push basic headers relating to author, Tweet text, and site name */
   headers.push(
     `<meta property="og:title" content="${tweet.author.name} (@${tweet.author.screen_name})"/>`,
     `<meta property="og:description" content="${text}"/>`,
     `<meta property="og:site_name" content="${siteName}"/>`,
-    `<meta property="twitter:card" content="${tweet.quote?.twitter_card || tweet.twitter_card}"/>`
+    `<meta property="twitter:card" content="${useCard}"/>`
   );
 
   /* Special reply handling if authorText is not overriden */