diff --git a/CHANGELOG.md b/CHANGELOG.md
index c01fe3b..a435650 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 - Fixed error in emoji update SQL query.
 - Restart stalled background jobs.
+- Order attachments by creation date.
 
 ## [1.18.0] - 2023-03-21
 
diff --git a/src/models/posts/queries.rs b/src/models/posts/queries.rs
index bc4d883..652dc50 100644
--- a/src/models/posts/queries.rs
+++ b/src/models/posts/queries.rs
@@ -391,6 +391,7 @@ pub const RELATED_ATTACHMENTS: &str =
     "ARRAY(
         SELECT media_attachment
         FROM media_attachment WHERE post_id = post.id
+        ORDER BY media_attachment.created_at
     ) AS attachments";
 
 pub const RELATED_MENTIONS: &str =