diff --git a/lib/src/event.dart b/lib/src/event.dart
index 4f72d350..e2530250 100644
--- a/lib/src/event.dart
+++ b/lib/src/event.dart
@@ -173,7 +173,7 @@ class Event extends MatrixEvent {
           : DateTime.now(),
       unsigned: unsigned,
       room: room,
-      sortOrder: sortOrder ?? 0.0,
+      sortOrder: sortOrder ?? unsigned.tryGet<num>(sortOrderKey) ?? 0.0,
     );
   }
 
diff --git a/lib/src/room.dart b/lib/src/room.dart
index 91bb8941..fe387836 100644
--- a/lib/src/room.dart
+++ b/lib/src/room.dart
@@ -54,6 +54,8 @@ const Map<HistoryVisibility, String> _historyVisibilityMap = {
 const String messageSendingStatusKey =
     'com.famedly.famedlysdk.message_sending_status';
 
+const String sortOrderKey = 'com.famedly.famedlysdk.sort_order';
+
 /// Represents a Matrix room.
 class Room {
   /// The full qualified Matrix ID for the room in the format '!localid:server.abc'.