diff --git a/src/livekit/MediaDevicesContext.tsx b/src/livekit/MediaDevicesContext.tsx
index 2ca695cd..dab98ffa 100644
--- a/src/livekit/MediaDevicesContext.tsx
+++ b/src/livekit/MediaDevicesContext.tsx
@@ -29,11 +29,7 @@ import {
   alwaysShowIphoneEarpiece as alwaysShowIphoneEarpieceSetting,
   type Setting,
 } from "../settings/settings";
-import {
-  type OutputDevice,
-  setAvailableOutputDevices$,
-  setOutputDevice$,
-} from "../controls";
+import { setAvailableOutputDevices$, setOutputDevice$ } from "../controls";
 import { useUrlParams } from "../UrlParams";
 
 // This hardcoded id is used in EX ios! It can only be changed in coordination with
@@ -325,7 +321,6 @@ function useControlledOutput(): MediaDeviceHandle {
   const { available } = useObservableEagerState(
     useObservable(() => {
       const outputDeviceData$ = setAvailableOutputDevices$.pipe(
-        startWith<OutputDevice[]>([]),
         map((devices) => {
           const deviceForEarpiece = devices.find((d) => d.forEarpiece);
           const deviceMapTuple: [string, DeviceLabel][] = devices.map(
diff --git a/src/settings/SettingsModal.tsx b/src/settings/SettingsModal.tsx
index f909d05e..0cc285c1 100644
--- a/src/settings/SettingsModal.tsx
+++ b/src/settings/SettingsModal.tsx
@@ -11,7 +11,6 @@ import { type MatrixClient } from "matrix-js-sdk";
 import { Button, Root as Form, Separator } from "@vector-im/compound-web";
 import { type Room as LivekitRoom } from "livekit-client";
 import { useObservableEagerState } from "observable-hooks";
-import { logger } from "matrix-js-sdk/lib/logger";
 
 import { Modal } from "../Modal";
 import styles from "./SettingsModal.module.css";