diff --git a/lib/utils/room_name_calculator.dart b/lib/utils/room_name_calculator.dart
index 43b4d5e..88dce92 100644
--- a/lib/utils/room_name_calculator.dart
+++ b/lib/utils/room_name_calculator.dart
@@ -6,8 +6,8 @@ class RoomNameCalculator {
   const RoomNameCalculator(this.room);
 
   String get name {
-    if (room.name.isEmpty &&
-        room.canonicalAlias.isEmpty &&
+    if ((room.name?.isEmpty ?? true) &&
+        (room.canonicalAlias?.isEmpty ?? true) &&
         !room.isDirectChat) {
       return "Group with ${room.displayname}";
     }