diff --git a/lib/controllers/client_controller.dart b/lib/controllers/client_controller.dart
index 56f606f..d8315c4 100644
--- a/lib/controllers/client_controller.dart
+++ b/lib/controllers/client_controller.dart
@@ -183,8 +183,8 @@ class ClientController extends AsyncNotifier<int> {
   // }));
 
   Future<IList<Event>> getRoomState(GetRoomStateRequest request) async {
-    Future<List?> getState(GetRoomStateRequest request) =>
-        _sendCommand("get_room_state", request.toJson()) as Future<List?>;
+    Future<List?> getState(GetRoomStateRequest request) async =>
+        (await _sendCommand("get_room_state", request.toJson())) as List?;
     final response = await getState(request);
 
     return (response ?? await getState(request.copyWith(refetch: true)) ?? [])
diff --git a/lib/helpers/extensions/scheme_to_theme.dart b/lib/helpers/extensions/scheme_to_theme.dart
index aff5d52..08c0ba6 100644
--- a/lib/helpers/extensions/scheme_to_theme.dart
+++ b/lib/helpers/extensions/scheme_to_theme.dart
@@ -8,7 +8,7 @@ extension SchemeToTheme on ColorScheme {
       backgroundColor: surfaceContainerLow,
     ),
     textTheme: ThemeData(
-      fontFamilyFallback: ["sans"],
+      fontFamilyFallback: ["sans", "emoji"],
       brightness: brightness,
     ).textTheme,
     inputDecorationTheme: const InputDecorationTheme(