diff --git a/lib/controllers/room_chat.dart b/lib/controllers/room_chat.dart
index 3e531bb..35038a0 100644
--- a/lib/controllers/room_chat.dart
+++ b/lib/controllers/room_chat.dart
@@ -75,12 +75,13 @@ class RoomChatController extends AsyncNotifier<IList<Event>?> {
       );
 
   Future<bool> loadOlder() async {
+    state = AsyncLoading();
     final timelineKeys = ref
         .read(RoomsController.provider.select((value) => value[roomId]))
         ?.timeline
         .keys;
     final response = await ref
-        .watch(ClientController.provider.notifier)
+        .read(ClientController.provider.notifier)
         .paginate(
           .new(
             roomId: roomId,
@@ -90,26 +91,30 @@ class RoomChatController extends AsyncNotifier<IList<Event>?> {
           ),
         );
 
-    ref
-        .watch(RoomsController.provider.notifier)
-        .update(
-          IMap({
-            roomId: Room(
-              events: IMap.fromIterable(
-                response.events.addAll(response.relatedEvents),
-                keyMapper: (event) => event.rowId,
-                valueMapper: (event) => event,
+    if (response.events.isEmpty) {
+      state = .data(state.value);
+    } else {
+      ref
+          .read(RoomsController.provider.notifier)
+          .update(
+            IMap({
+              roomId: Room(
+                events: IMap.fromIterable(
+                  response.events.addAll(response.relatedEvents),
+                  keyMapper: (event) => event.rowId,
+                  valueMapper: (event) => event,
+                ),
+                hasMore: response.hasMore,
+                timeline: IMap.fromIterable(
+                  response.events,
+                  keyMapper: (event) => event.timelineRowId,
+                  valueMapper: (event) => event.rowId,
+                ),
               ),
-              hasMore: response.hasMore,
-              timeline: IMap.fromIterable(
-                response.events,
-                keyMapper: (event) => event.timelineRowId,
-                valueMapper: (event) => event.rowId,
-              ),
-            ),
-          }),
-          .new(),
-        );
+            }),
+            .new(),
+          );
+    }
 
     return response.hasMore;
   }
diff --git a/lib/widgets/room_chat.dart b/lib/widgets/room_chat.dart
index fcab5fe..07cf26d 100644
--- a/lib/widgets/room_chat.dart
+++ b/lib/widgets/room_chat.dart
@@ -80,6 +80,7 @@ class RoomChat extends HookConsumerWidget {
     final controllerData = ref.watch(controllerProvider);
 
     final topEventBeforeLoad = useState<String?>(null);
+    final hasMore = useState<bool>(true);
 
     Future<void> jumpToId(String eventId) async {
       final index = controllerData.value?.indexWhere(
@@ -105,7 +106,7 @@ class RoomChat extends HookConsumerWidget {
     Future<void> loadOlder() async {
       if (controllerData case AsyncData(:final value?)) {
         topEventBeforeLoad.value = value.firstOrNull?.eventId;
-        await notifier.loadOlder();
+        hasMore.value = await notifier.loadOlder();
       }
     }
 
@@ -470,19 +471,20 @@ class RoomChat extends HookConsumerWidget {
                                 ScrollViewKeyboardDismissBehavior.onDrag,
                             controller: scrollController,
                             slivers: [
-                              SliverToBoxAdapter(
-                                child: Padding(
-                                  padding: .symmetric(vertical: 36),
-                                  child: Center(
-                                    child: ElevatedButton(
-                                      onPressed: controllerData is AsyncData
-                                          ? loadOlder
-                                          : null,
-                                      child: Text("Load More"),
+                              if (hasMore.value)
+                                SliverToBoxAdapter(
+                                  child: Padding(
+                                    padding: .symmetric(vertical: 36),
+                                    child: Center(
+                                      child: ElevatedButton(
+                                        onPressed: controllerData is AsyncData
+                                            ? loadOlder
+                                            : null,
+                                        child: Text("Load More"),
+                                      ),
                                     ),
                                   ),
                                 ),
-                              ),
 
                               SuperSliverList.builder(
                                 listController: listController.value,