diff --git a/lib/src/room.dart b/lib/src/room.dart
index 8787ebd..651c5d0 100644
--- a/lib/src/room.dart
+++ b/lib/src/room.dart
@@ -1033,7 +1033,7 @@ class Room {
     );
     if (client.store == null) {
       prev_batch = "";
-      await requestHistory();
+      await requestHistory(historyCount: 10);
     }
     return timeline;
   }
diff --git a/test/fake_matrix_api.dart b/test/fake_matrix_api.dart
index 1528d77..899904d 100644
--- a/test/fake_matrix_api.dart
+++ b/test/fake_matrix_api.dart
@@ -583,7 +583,7 @@ class FakeMatrixApi extends MockClient {
             "origin_server_ts": 1432735824653,
             "unsigned": {"age": 1234}
           },
-      "/client/r0/rooms/!localpart:server.abc/messages?from=&dir=b&limit=100&filter=%7B%22room%22:%7B%22state%22:%7B%22lazy_load_members%22:true%7D%7D%7D":
+      "/client/r0/rooms/!localpart:server.abc/messages?from=&dir=b&limit=10&filter=%7B%22room%22:%7B%22state%22:%7B%22lazy_load_members%22:true%7D%7D%7D":
           (var req) => messagesResponse,
       "/client/r0/rooms/!1234:example.com/messages?from=1234&dir=b&limit=100&filter=%7B%22room%22:%7B%22state%22:%7B%22lazy_load_members%22:true%7D%7D%7D":
           (var req) => messagesResponse,