diff --git a/lib/fake_matrix_api.dart b/lib/fake_matrix_api.dart
index 8d96a4b3..b0b8f0ab 100644
--- a/lib/fake_matrix_api.dart
+++ b/lib/fake_matrix_api.dart
@@ -2597,7 +2597,7 @@ class FakeMatrixApi extends BaseClient {
           (var req) => {},
       '/client/v3/user/%40alice%3Aexample.com/rooms/1234/account_data/test.account.data':
           (var req) => {},
-      '/client/v3/user/%40test%3AfakeServer.notExisting/rooms/!localpart%3Aserver.abc/account_data/com.famedly.marked_unread':
+      '/client/v3/user/%40test%3AfakeServer.notExisting/rooms/!localpart%3Aserver.abc/account_data/m.marked_unread':
           (var req) => {},
       '/client/v3/user/%40test%3AfakeServer.notExisting/account_data/m.direct':
           (var req) => {},
diff --git a/lib/src/room.dart b/lib/src/room.dart
index 9e5ee931..9a1fe35e 100644
--- a/lib/src/room.dart
+++ b/lib/src/room.dart
@@ -493,7 +493,9 @@ class Room {
 
   bool get markedUnread {
     return MarkedUnread.fromJson(
-            roomAccountData[EventType.markedUnread]?.content ?? {})
+            roomAccountData[EventType.markedUnread]?.content ??
+                roomAccountData[EventType.oldMarkedUnread]?.content ??
+                {})
         .unread;
   }
 
diff --git a/lib/src/utils/marked_unread.dart b/lib/src/utils/marked_unread.dart
index 8e822972..83fc9f4e 100644
--- a/lib/src/utils/marked_unread.dart
+++ b/lib/src/utils/marked_unread.dart
@@ -19,7 +19,8 @@
 import 'package:matrix/matrix_api_lite.dart';
 
 mixin EventType {
-  static const String markedUnread = 'com.famedly.marked_unread';
+  static const String markedUnread = 'm.marked_unread';
+  static const String oldMarkedUnread = 'com.famedly.marked_unread';
 }
 
 class MarkedUnread {
diff --git a/test/room_test.dart b/test/room_test.dart
index 3854dcb1..99c8f197 100644
--- a/test/room_test.dart
+++ b/test/room_test.dart
@@ -1226,10 +1226,9 @@ void main() {
       await room.markUnread(true);
       await room.markUnread(false);
       expect(room.markedUnread, false);
-      room.roomAccountData['com.famedly.marked_unread'] =
-          BasicRoomEvent.fromJson({
+      room.roomAccountData['m.marked_unread'] = BasicRoomEvent.fromJson({
         'content': {'unread': true},
-        'type': 'com.famedly.marked_unread'
+        'type': 'm.marked_unread'
       });
       expect(room.markedUnread, true);
     });