diff --git a/src/state/CallViewModel.ts b/src/state/CallViewModel.ts
index f8f44069..a4c712b4 100644
--- a/src/state/CallViewModel.ts
+++ b/src/state/CallViewModel.ts
@@ -668,8 +668,11 @@ export class CallViewModel extends ViewModel {
                             (
                               localUserMedia?.vm as LocalUserMediaViewModel
                             ).alwaysShow.pipe(
-                              map((alwaysShow) =>
-                                alwaysShow ? localUserMedia : undefined,
+                              map(
+                                (alwaysShow) =>
+                                  (alwaysShow
+                                    ? localUserMedia?.vm
+                                    : undefined) ?? null,
                               ),
                             ) ?? of(null)
                           );