diff --git a/lib/pages/views/chat_list_view.dart b/lib/pages/views/chat_list_view.dart
index 099543e4..9b5e161f 100644
--- a/lib/pages/views/chat_list_view.dart
+++ b/lib/pages/views/chat_list_view.dart
@@ -166,7 +166,7 @@ class ChatListView extends StatelessWidget {
                           return FutureBuilder<void>(
                             future: controller.waitForFirstSync(),
                             builder: (BuildContext context, snapshot) {
-                              if (snapshot.hasData) {
+                              if (Matrix.of(context).client.prevBatch != null) {
                                 final rooms = List<Room>.from(
                                     Matrix.of(context).client.rooms);
                                 rooms.removeWhere(