diff --git a/lib/controllers/room_chat_controller.dart b/lib/controllers/room_chat_controller.dart
index 38b839d..e1401ad 100644
--- a/lib/controllers/room_chat_controller.dart
+++ b/lib/controllers/room_chat_controller.dart
@@ -75,15 +75,14 @@ class RoomChatController extends AsyncNotifier<InMemoryChatController> {
         ),
       ).future,
     );
+
+    // While there are under 20 messages, try up to load more messages until there's no more or we have 20 messages.
     final controller = InMemoryChatController(messages: messages.toList());
-
-    ref.onDispose(controller.dispose);
-
-    // While there are under 20 messages, try up to load more messages until theres no more or we have 20 messages.
     for (var more = true; more == true && controller.messages.length < 20;) {
       more = await loadOlder(controller);
     }
 
+    ref.onDispose(controller.dispose);
     return controller;
   }
 
diff --git a/lib/controllers/rooms_controller.dart b/lib/controllers/rooms_controller.dart
index efdcfaa..3c34fc9 100644
--- a/lib/controllers/rooms_controller.dart
+++ b/lib/controllers/rooms_controller.dart
@@ -2,7 +2,6 @@ import "package:collection/collection.dart";
 import "package:fast_immutable_collections/fast_immutable_collections.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
 import "package:nexus/controllers/client_state_controller.dart";
-import "package:nexus/controllers/room_chat_controller.dart";
 import "package:nexus/helpers/extensions/mxc_to_https.dart";
 import "package:nexus/models/read_receipt.dart";
 import "package:nexus/models/room.dart";
@@ -33,23 +32,6 @@ class RoomsController extends Notifier<IMap<String, Room>> {
         (item) => item.eventId,
       );
 
-      if (addToNewEvents) {
-        final provider = RoomChatController.provider(roomId);
-        if (ref.exists(provider)) {
-          for (final event
-              in incoming.timeline
-                  .map(
-                    (timelineTuple) => events?.firstWhereOrNull(
-                      (event) => timelineTuple.eventRowId == event.rowId,
-                    ),
-                  )
-                  .nonNulls
-                  .toIList()) {
-            ref.read(provider.notifier).addEvent(event);
-          }
-        }
-      }
-
       return acc.add(
         roomId,
         existing?.copyWith(
diff --git a/lib/widgets/chat_page/wrappers/text_message_wrapper.dart b/lib/widgets/chat_page/wrappers/text_message_wrapper.dart
index 8d7a625..4c84117 100644
--- a/lib/widgets/chat_page/wrappers/text_message_wrapper.dart
+++ b/lib/widgets/chat_page/wrappers/text_message_wrapper.dart
@@ -136,7 +136,7 @@ class TextMessageWrapper extends ConsumerWidget {
                               onLinkPreviewDataFetched: (_) => null,
                             ),
                     ),
-              if (extra != null) extra!,
+              ?extra,
             ],
           ),
         ),