diff --git a/src/state/CallViewModel/CallViewModel.ts b/src/state/CallViewModel/CallViewModel.ts
index b940555fa..9b77dc5af 100644
--- a/src/state/CallViewModel/CallViewModel.ts
+++ b/src/state/CallViewModel/CallViewModel.ts
@@ -25,8 +25,8 @@ import {
   trackBySource$,
   type TransportMetadata,
   type VideoCaptureSettings,
+  type VideoProcessor,
 } from "@element-hq/matrixrtc-sdk";
-import { type Track, type TrackProcessor } from "livekit-client";
 import {
   KnownMembership,
   type Room as MatrixRoom,
@@ -180,7 +180,7 @@ export interface CallViewModelOptions {
    */
   capture?: CaptureSettings;
   /** Background blur and the like, applied to the camera as it changes. */
-  videoProcessor$?: Behavior<TrackProcessor<Track.Kind.Video> | undefined>;
+  videoProcessor$?: Behavior<VideoProcessor | undefined>;
   /**
    * The application hosting Element Call, which can ask it to hang up and wants
    * to know when the user joins or leaves. Defaults to no host.
diff --git a/src/state/media/MemberMediaViewModel.ts b/src/state/media/MemberMediaViewModel.ts
index bdff672d5..a75588f3a 100644
--- a/src/state/media/MemberMediaViewModel.ts
+++ b/src/state/media/MemberMediaViewModel.ts
@@ -91,13 +91,7 @@ export function createMemberMedia(
   const unencrypted$ = (
     track$: Behavior<MediaTrack | undefined>,
   ): Observable<boolean> =>
-    track$.pipe(
-      switchMap((track) =>
-        track === undefined
-          ? of(false)
-          : track.encrypted$.pipe(map((encrypted) => !encrypted)),
-      ),
-    );
+    track$.pipe(map((track) => track !== undefined && !track.encrypted));
 
   return {
     ...createBaseMedia(inputs),
diff --git a/src/utils/test.ts b/src/utils/test.ts
index 7a6677008..205055b60 100644
--- a/src/utils/test.ts
+++ b/src/utils/test.ts
@@ -310,7 +310,7 @@ export function mockMediaTrack(
     kind: "video",
     id: "track",
     muted$: constant(false),
-    encrypted$: constant(true),
+    encrypted: true,
     stats$: constant(undefined),
     isActive$: constant(false),
     attach: vi.fn(),