diff --git a/lib/widgets/lazy_loading/message_displayname.dart b/lib/widgets/lazy_loading/message_displayname.dart
index 693c157..2bcd8d5 100644
--- a/lib/widgets/lazy_loading/message_displayname.dart
+++ b/lib/widgets/lazy_loading/message_displayname.dart
@@ -1,7 +1,6 @@
 import "package:flutter/material.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
 import "package:nexus/controllers/author_controller.dart";
-import "package:nexus/helpers/extensions/better_when.dart";
 import "package:nexus/helpers/extensions/get_localpart.dart";
 import "package:nexus/helpers/extensions/show_user_popover.dart";
 import "package:nexus/helpers/extensions/string_to_color.dart";
@@ -19,13 +18,12 @@ class MessageDisplayname extends ConsumerWidget {
   });
 
   @override
-  Widget build(BuildContext context, WidgetRef ref) => ref
-      .watch(AuthorController.provider(event))
-      .betterWhen(
-        data: (membership) => InkWell(
+  Widget build(BuildContext context, WidgetRef ref) =>
+      switch (ref.watch(AuthorController.provider(event))) {
+        AsyncData(:final value) || AsyncLoading(:final value?) => InkWell(
           onTapUp: clickable
               ? (details) => context.showUserPopover(
-                  membership,
+                  value,
                   event.sender,
                   globalPosition: details.globalPosition,
                 )
@@ -34,7 +32,7 @@ class MessageDisplayname extends ConsumerWidget {
             spacing: 4,
             children: [
               Text(
-                membership.displayName ?? event.sender.localpart,
+                value.displayName ?? event.sender.localpart,
                 style:
                     style ??
                     TextStyle(
@@ -56,6 +54,6 @@ class MessageDisplayname extends ConsumerWidget {
             ],
           ),
         ),
-        loading: () => Text(""),
-      );
+        _ => Text(""),
+      };
 }