diff --git a/app/javascript/mastodon/actions/importer/normalizer.js b/app/javascript/mastodon/actions/importer/normalizer.js
index 69d6bf03da..b030c94b31 100644
--- a/app/javascript/mastodon/actions/importer/normalizer.js
+++ b/app/javascript/mastodon/actions/importer/normalizer.js
@@ -70,10 +70,6 @@ export function normalizeStatus(status, normalOldStatus) {
     normalStatus.emoji_reactions = normalizeEmojiReactions(status.emoji_reactions);
   }
 
-  if (status.media_attachments_ex) {
-    normalStatus.media_attachments = status.media_attachments.concat(status.media_attachments_ex);
-  }
-
   if (!status.visibility_ex) {
     normalStatus.visibility_ex = status.visibility;
   }
diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb
index eb79c1efea..547ca9f32a 100644
--- a/app/models/media_attachment.rb
+++ b/app/models/media_attachment.rb
@@ -36,7 +36,7 @@ class MediaAttachment < ApplicationRecord
   include RoutingHelper
 
   LOCAL_STATUS_ATTACHMENT_MAX = 4
-  ACTIVITYPUB_STATUS_ATTACHMENT_MAX = 8
+  ACTIVITYPUB_STATUS_ATTACHMENT_MAX = 16
 
   enum type: { :image => 0, :gifv => 1, :video => 2, :unknown => 3, :audio => 4 }
   enum processing: { :queued => 0, :in_progress => 1, :complete => 2, :failed => 3 }, _prefix: true
diff --git a/app/models/status.rb b/app/models/status.rb
index 7d11ffcf61..ab6eb495a3 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -291,14 +291,6 @@ class Status < ApplicationRecord
     end
   end
 
-  def ordered_media_attachments_original_mastodon
-    ordered_media_attachments.take(4)
-  end
-
-  def ordered_media_attachments_extra
-    ordered_media_attachments.drop(4).take(4)
-  end
-
   def replies_count
     status_stat&.replies_count || 0
   end
diff --git a/app/serializers/rest/instance_serializer.rb b/app/serializers/rest/instance_serializer.rb
index 3d4f88c5e9..748a0b8587 100644
--- a/app/serializers/rest/instance_serializer.rb
+++ b/app/serializers/rest/instance_serializer.rb
@@ -55,6 +55,7 @@ class REST::InstanceSerializer < ActiveModel::Serializer
       statuses: {
         max_characters: StatusLengthValidator::MAX_CHARS,
         max_media_attachments: MediaAttachment::LOCAL_STATUS_ATTACHMENT_MAX,
+        max_media_attachments_from_activitypub: MediaAttachment::ACTIVITYPUB_STATUS_ATTACHMENT_MAX,
         characters_reserved_per_url: StatusLengthValidator::URL_PLACEHOLDER_CHARS,
       },
 
@@ -97,7 +98,6 @@ class REST::InstanceSerializer < ActiveModel::Serializer
   def fedibird_capabilities
     capabilities = [
       :emoji_reaction,
-      :kmyblue_extra_media_attachments,
       :kmyblue_visibility_public_unlisted,
       :enable_wide_emoji,
       :enable_wide_emoji_reaction,
diff --git a/app/serializers/rest/status_serializer.rb b/app/serializers/rest/status_serializer.rb
index fb2c7f2b2e..fec8d32009 100644
--- a/app/serializers/rest/status_serializer.rb
+++ b/app/serializers/rest/status_serializer.rb
@@ -22,8 +22,7 @@ class REST::StatusSerializer < ActiveModel::Serializer
   belongs_to :application, if: :show_application?
   belongs_to :account, serializer: REST::AccountSerializer
 
-  has_many :ordered_media_attachments_original_mastodon, key: :media_attachments, serializer: REST::MediaAttachmentSerializer
-  has_many :ordered_media_attachments_extra, key: :media_attachments_ex, serializer: REST::MediaAttachmentSerializer
+  has_many :ordered_media_attachments, key: :media_attachments, serializer: REST::MediaAttachmentSerializer
   has_many :ordered_mentions, key: :mentions
   has_many :tags
   has_many :emojis, serializer: REST::CustomEmojiSerializer
diff --git a/app/serializers/rest/v1/instance_serializer.rb b/app/serializers/rest/v1/instance_serializer.rb
index d2c49ba0e3..881d685042 100644
--- a/app/serializers/rest/v1/instance_serializer.rb
+++ b/app/serializers/rest/v1/instance_serializer.rb
@@ -65,6 +65,7 @@ class REST::V1::InstanceSerializer < ActiveModel::Serializer
       statuses: {
         max_characters: StatusLengthValidator::MAX_CHARS,
         max_media_attachments: MediaAttachment::LOCAL_STATUS_ATTACHMENT_MAX,
+        max_media_attachments_from_activitypub: MediaAttachment::ACTIVITYPUB_STATUS_ATTACHMENT_MAX,
         characters_reserved_per_url: StatusLengthValidator::URL_PLACEHOLDER_CHARS,
       },
 
@@ -107,7 +108,6 @@ class REST::V1::InstanceSerializer < ActiveModel::Serializer
   def fedibird_capabilities
     capabilities = [
       :emoji_reaction,
-      :kmyblue_extra_media_attachments,
       :kmyblue_visibility_public_unlisted,
       :enable_wide_emoji,
       :enable_wide_emoji_reaction,