From 4ec9ccec9f0d6835eb6dd726787938c1489ac1c8 Mon Sep 17 00:00:00 2001
From: Micheline Wu <69046953+michelinewu@users.noreply.github.com>
Date: Wed, 8 Apr 2026 18:29:23 -0400
Subject: [PATCH] Create temporary sources before setting default source in
 hardware step.

---
 .../pages/onboarding/HardwareSetup.tsx               | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/components-react/pages/onboarding/HardwareSetup.tsx b/app/components-react/pages/onboarding/HardwareSetup.tsx
index 2fbd867454a4..b9f106dd0afe 100644
--- a/app/components-react/pages/onboarding/HardwareSetup.tsx
+++ b/app/components-react/pages/onboarding/HardwareSetup.tsx
@@ -31,15 +31,17 @@ export function HardwareSetup() {
 
   // Set up temporary sources
   useEffect(() => {
-    DefaultHardwareService.createTemporarySources();
-
-    if (!DefaultHardwareService.selectedVideoSource && v.videoDevices.length) {
-      DefaultHardwareService.actions.setDefault('video', v.videoDevices[0].value);
-    }
+    DefaultHardwareService.actions.createTemporarySources();
 
     return () => DefaultHardwareService.actions.clearTemporarySources();
   }, []);
 
+  useEffect(() => {
+    if (!v.selectedVideoSource && v.videoDevices.length) {
+      DefaultHardwareService.actions.setDefault('video', v.videoDevices[0].value);
+    }
+  }, [v.selectedVideoSource, v.videoDevices.length]);
+
   function setVideoDevice(val: string) {
     const oldPresetValue = v.presetFilterValue;