diff --git a/scripts/logviewer/main.js b/scripts/logviewer/main.js
index b6883667..dce82fb8 100644
--- a/scripts/logviewer/main.js
+++ b/scripts/logviewer/main.js
@@ -395,4 +395,4 @@ document.getElementById("showAll").addEventListener("click", () => {
     for (const node of document.querySelectorAll(".hidden")) {
         node.classList.remove("hidden");
     }
-});
\ No newline at end of file
+});
diff --git a/src/domain/session/SessionViewModel.js b/src/domain/session/SessionViewModel.js
index 0c9dddaa..4e5930b1 100644
--- a/src/domain/session/SessionViewModel.js
+++ b/src/domain/session/SessionViewModel.js
@@ -191,7 +191,7 @@ export class SessionViewModel extends ViewModel {
     async _createArchivedRoomViewModel(roomId) {
         const room = await this._client.session.loadArchivedRoom(roomId);
         if (room) {
-            const roomVM = new RoomViewModel(this.childOptions({room}));
+            const roomVM = new RoomViewModel(this.childOptions({room, session: this._client.session}));
             roomVM.load();
             return roomVM;
         }
diff --git a/src/observable/value/PickMapObservableValue.ts b/src/observable/value/PickMapObservableValue.ts
index b493d841..0b30fcfd 100644
--- a/src/observable/value/PickMapObservableValue.ts
+++ b/src/observable/value/PickMapObservableValue.ts
@@ -62,7 +62,7 @@ export class PickMapObservableValue<K, V> extends BaseObservableValue<V | undefi
             this.key = undefined;
             // try to see if there is another key that fullfills pickKey
             for (const [key] of this.map) {
-                this.updateKey(key) || changed;
+                this.updateKey(key);
             }
             this.emit(this.get());
         }
diff --git a/src/platform/web/ui/session/room/common.ts b/src/platform/web/ui/session/room/common.ts
index a2732ff4..28543bcf 100644
--- a/src/platform/web/ui/session/room/common.ts
+++ b/src/platform/web/ui/session/room/common.ts
@@ -53,6 +53,6 @@ export function viewClassForEntry(entry: SimpleTile): TileViewConstructor | unde
         case "redacted":
             return RedactedView;
         case "call":
-            return CallTileView;
+            return CallTileView as any as TileViewConstructor;
     }
 }