diff --git a/src/domain/session/rightpanel/RoomInfoViewModel.js b/src/domain/session/rightpanel/RoomInfoViewModel.js
index c132acf8..951f10c0 100644
--- a/src/domain/session/rightpanel/RoomInfoViewModel.js
+++ b/src/domain/session/rightpanel/RoomInfoViewModel.js
@@ -12,7 +12,7 @@ export class RoomInfoViewModel extends ViewModel {
     }
 
     get name() {
-        return this._roomSummary.name || this._room._heroes._roomName;
+        return this._roomSummary.name || this._room._heroes?._roomName || this._roomSummary.canonicalAlias;
     }
 
     get isEncrypted() {