diff --git a/lib/widgets/chat_page/room_chat.dart b/lib/widgets/chat_page/room_chat.dart
index a637b4f..a2add10 100644
--- a/lib/widgets/chat_page/room_chat.dart
+++ b/lib/widgets/chat_page/room_chat.dart
@@ -10,7 +10,6 @@ import "package:nexus/controllers/power_level_controller.dart";
 import "package:nexus/controllers/selected_room_controller.dart";
 import "package:nexus/controllers/room_chat_controller.dart";
 import "package:nexus/controllers/via_controller.dart";
-import "package:nexus/helpers/extensions/better_when.dart";
 import "package:nexus/models/configs/power_level_config.dart";
 import "package:nexus/models/content/content.dart";
 import "package:nexus/models/content/message.dart";
@@ -289,30 +288,6 @@ class RoomChat extends HookConsumerWidget {
       ].toIList();
     }
 
-    SuperListView messageView(IList<Event> events) => SuperListView.builder(
-      controller: scrollController,
-      listController: listController.value,
-      itemCount: events.length,
-      itemBuilder: (_, index) => MessageWrapper(
-        events[index],
-        EventText(
-          events[index],
-          onTapReply: () => listController.value.animateToItem(
-            index: index,
-            scrollController: scrollController,
-            alignment: 0.5,
-            duration: (_) => Duration(milliseconds: 250),
-            curve: (_) => Curves.easeInOut,
-          ),
-          getEventOptions: getEventOptions,
-        ),
-        // TODO: Reimplement grouping
-        isGrouped: false,
-        // TODO: Reimplement flashing
-        isFlashing: false,
-      ),
-    );
-
     return Scaffold(
       appBar: RoomAppbar(
         isDesktop: isDesktop,
@@ -329,9 +304,31 @@ class RoomChat extends HookConsumerWidget {
               children: [
                 Positioned.fill(
                   child: switch (ref.watch(controllerProvider)) {
-                    AsyncData(:final value) => messageView(value),
-                    AsyncLoading(:final value) =>
-                      value == null ? Loading() : messageView(value),
+                    AsyncData(:final value) ||
+                    AsyncLoading(:final value?) => SuperListView.builder(
+                      controller: scrollController,
+                      listController: listController.value,
+                      itemCount: value.length,
+                      itemBuilder: (_, index) => MessageWrapper(
+                        value[index],
+                        EventText(
+                          value[index],
+                          onTapReply: () => listController.value.animateToItem(
+                            index: index,
+                            scrollController: scrollController,
+                            alignment: 0.5,
+                            duration: (_) => Duration(milliseconds: 250),
+                            curve: (_) => Curves.easeInOut,
+                          ),
+                          getEventOptions: getEventOptions,
+                        ),
+                        // TODO: Reimplement grouping
+                        isGrouped: false,
+                        // TODO: Reimplement flashing
+                        isFlashing: false,
+                      ),
+                    ),
+                    AsyncLoading() => Loading(),
                     AsyncError(:final error, :final stackTrace) => ErrorDialog(
                       error,
                       stackTrace,