diff --git a/src/client/app/desktop/views/components/post-detail.sub.vue b/src/client/app/desktop/views/components/post-detail.sub.vue
index 35377e7c24..285b5dedee 100644
--- a/src/client/app/desktop/views/components/post-detail.sub.vue
+++ b/src/client/app/desktop/views/components/post-detail.sub.vue
@@ -17,7 +17,7 @@
-
diff --git a/src/client/app/desktop/views/components/post-detail.vue b/src/client/app/desktop/views/components/post-detail.vue
index 5c7a7dfdbe..1811e22bad 100644
--- a/src/client/app/desktop/views/components/post-detail.vue
+++ b/src/client/app/desktop/views/components/post-detail.vue
@@ -39,7 +39,7 @@
-
-
-
+
({{ post.media.length }}つのメディア)
diff --git a/src/client/app/mobile/views/components/post-detail.vue b/src/client/app/mobile/views/components/post-detail.vue
index f0af1a61aa..6411011b89 100644
--- a/src/client/app/mobile/views/components/post-detail.vue
+++ b/src/client/app/mobile/views/components/post-detail.vue
@@ -42,7 +42,7 @@
{{ tag }}
-
-
-
+
({{ post.media.length }}個のメディア)
diff --git a/src/client/docs/api/entities/post.yaml b/src/client/docs/api/entities/post.yaml
index 74d7973e38..da79866ba1 100644
--- a/src/client/docs/api/entities/post.yaml
+++ b/src/client/docs/api/entities/post.yaml
@@ -33,8 +33,8 @@ props:
type: "id(DriveFile)[]"
optional: true
desc:
- ja: "添付されているメディアのID"
- en: "The IDs of the attached media"
+ ja: "添付されているメディアのID (なければレスポンスでは空配列)"
+ en: "The IDs of the attached media (empty array for response if no media is attached)"
- name: "media"
type: "entity(DriveFile)[]"
optional: true
diff --git a/src/server/api/endpoints/posts/create.ts b/src/server/api/endpoints/posts/create.ts
index 170b667191..aa7e93c28f 100644
--- a/src/server/api/endpoints/posts/create.ts
+++ b/src/server/api/endpoints/posts/create.ts
@@ -254,7 +254,7 @@ module.exports = (params, user: IUser, app) => new Promise(async (res, rej) => {
createdAt: new Date(),
channelId: channel ? channel._id : undefined,
index: channel ? channel.index + 1 : undefined,
- mediaIds: files ? files.map(file => file._id) : undefined,
+ mediaIds: files ? files.map(file => file._id) : [],
replyId: reply ? reply._id : undefined,
repostId: repost ? repost._id : undefined,
poll: poll,
diff --git a/tools/migration/nighthike/6.js b/tools/migration/nighthike/6.js
new file mode 100644
index 0000000000..ff78df4e09
--- /dev/null
+++ b/tools/migration/nighthike/6.js
@@ -0,0 +1 @@
+db.posts.update({ mediaIds: null }, { $set: { mediaIds: [] } }, false, true);