diff --git a/src/state/MediaDevices.ts b/src/state/MediaDevices.ts
index e5b59468..de3ae4fd 100644
--- a/src/state/MediaDevices.ts
+++ b/src/state/MediaDevices.ts
@@ -395,7 +395,7 @@ class ControlledAudioOutput implements MediaDevice<
 
   public readonly selected$ = this.scope.behavior(
     combineLatest(
-      [this.available$, this.deviceSelection$],
+      [this.available$, this.deviceSelection$.pipe(startWith(undefined))],
       (available, preferredId) => {
         this.logger.debug(
           `selecting device: Preferred:${preferredId}: platform ${this.platform}, intent:${this.initialIntent}: Available: ${Array.from(available.keys()).join(",")}`,