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;