diff --git a/lib/src/client.dart b/lib/src/client.dart
index b557e09e..fdbc4374 100644
--- a/lib/src/client.dart
+++ b/lib/src/client.dart
@@ -2991,8 +2991,9 @@ class Client extends MatrixApi {
             chatUpdate.timeline?.prevBatch != null)) {
       /// [InvitedRoomUpdate] doesn't have prev_batch, so we want to set it in case
       /// the room first appeared in sync update when membership was invite.
-    if ((rooms[roomIndex].membership == Membership.invite ||
-              chatUpdate.timeline?.limited == true) &&
+      if ((rooms[roomIndex].membership == Membership.invite ||
+              chatUpdate.timeline?.limited == true ||
+              rooms[roomIndex].prev_batch == null) &&
           chatUpdate.timeline?.prevBatch != null) {
         rooms[roomIndex].prev_batch = chatUpdate.timeline?.prevBatch;
       }