diff --git a/crates/lavina-core/src/repo/room.rs b/crates/lavina-core/src/repo/room.rs
index 81d0398..98b46dd 100644
--- a/crates/lavina-core/src/repo/room.rs
+++ b/crates/lavina-core/src/repo/room.rs
@@ -48,7 +48,7 @@ impl Storage {
                 where
                     room_id = ?
                 order by
-                    created_at desc;
+                    messages.id desc;
             ",
         )
         .bind(room_id)