diff --git a/packages/chat_repository_interface/lib/src/services/chat_service.dart b/packages/chat_repository_interface/lib/src/services/chat_service.dart
index 1e9dc18..1710b92 100644
--- a/packages/chat_repository_interface/lib/src/services/chat_service.dart
+++ b/packages/chat_repository_interface/lib/src/services/chat_service.dart
@@ -157,7 +157,9 @@ class ChatService {
           ...Map.fromEntries(
             messages.map((message) => MapEntry(message.id, message)),
           ),
-        }.values.toList();
+        }.values.toList().sorted(
+              (a, b) => a.timestamp.compareTo(b.timestamp),
+            );
 
     return Rx.combineLatest2(
       chatRepository.getMessages(userId: userId, chatId: chatId),