diff --git a/app/views/statuses/_og_description.html.haml b/app/views/statuses/_og_description.html.haml
index a7b18424d28..56aacbe9861 100644
--- a/app/views/statuses/_og_description.html.haml
+++ b/app/views/statuses/_og_description.html.haml
@@ -1,4 +1,4 @@
-- description = status_description(activity)
+-# locals(description:)
 
 %meta{ name: 'description', content: description }/
 = opengraph 'og:description', description
diff --git a/app/views/statuses/_og_image.html.haml b/app/views/statuses/_og_image.html.haml
index 1ae97adff67..075202d6ce4 100644
--- a/app/views/statuses/_og_image.html.haml
+++ b/app/views/statuses/_og_image.html.haml
@@ -1,6 +1,7 @@
-- if activity.is_a?(Status) && (activity.non_sensitive_with_media? || (activity.with_media? && Setting.preview_sensitive_media))
-  - player_card = false
-  - activity.ordered_media_attachments.each do |media|
+-# locals(status:, account:)
+
+- if status.non_sensitive_with_media? || (status.with_media? && Setting.preview_sensitive_media)
+  - status.ordered_media_attachments.each do |media|
     - if media.image?
       = opengraph 'og:image', full_asset_url(media.file.url(:original))
       = opengraph 'og:image:type', media.file_content_type
@@ -10,7 +11,6 @@
       - if media.description.present?
         = opengraph 'og:image:alt', media.description
     - elsif media.video? || media.gifv?
-      - player_card = true
       = opengraph 'og:image', full_asset_url(media.file.url(:small))
       = opengraph 'og:image:type', 'image/png'
       - unless media.file.meta.nil?
@@ -28,7 +28,6 @@
         = opengraph 'twitter:player:width', media.file.meta.dig('original', 'width')
         = opengraph 'twitter:player:height', media.file.meta.dig('original', 'height')
     - elsif media.audio?
-      - player_card = true
       = opengraph 'og:image', full_asset_url(account.avatar.url(:original))
       = opengraph 'og:image:width', '400'
       = opengraph 'og:image:height', '400'
@@ -40,7 +39,7 @@
       = opengraph 'twitter:player:stream:content_type', media.file_content_type
       = opengraph 'twitter:player:width', '670'
       = opengraph 'twitter:player:height', '380'
-  - if player_card
+  - if status.ordered_media_attachments.any?(&:larger_media_format?)
     = opengraph 'twitter:card', 'player'
   - else
     = opengraph 'twitter:card', 'summary_large_image'
diff --git a/app/views/statuses/show.html.haml b/app/views/statuses/show.html.haml
index cc779f4370e..275931ec3f7 100644
--- a/app/views/statuses/show.html.haml
+++ b/app/views/statuses/show.html.haml
@@ -16,7 +16,7 @@
     = opengraph 'og:locale', @status.language
   = opengraph 'profile:username', acct(@account)[1..]
 
-  = render 'og_description', activity: @status
-  = render 'og_image', activity: @status, account: @account
+  = render 'og_description', description: status_description(@status)
+  = render 'og_image', status: @status, account: @account
 
 = render 'shared/web_app'