diff --git a/web/src/components/settings/CameraStreamingDialog.tsx b/web/src/components/settings/CameraStreamingDialog.tsx
index 94271dc4a..b7f1979ea 100644
--- a/web/src/components/settings/CameraStreamingDialog.tsx
+++ b/web/src/components/settings/CameraStreamingDialog.tsx
@@ -81,11 +81,10 @@ export function CameraStreamingDialog({
 
   const cameraMetadata = streamName ? streamMetadata?.[streamName] : undefined;
 
-  const audioFeatures = useMemo(() => {
-    return detectCameraAudioFeatures(cameraMetadata);
-  }, [cameraMetadata]);
-
-  const supportsAudioOutput = audioFeatures.audioOutput;
+  const { audioOutput: supportsAudioOutput } = useMemo(
+    () => detectCameraAudioFeatures(cameraMetadata),
+    [cameraMetadata],
+  );
 
   // handlers
 
diff --git a/web/src/components/settings/wizard/Step4Validation.tsx b/web/src/components/settings/wizard/Step4Validation.tsx
index c82f17727..44a39f39b 100644
--- a/web/src/components/settings/wizard/Step4Validation.tsx
+++ b/web/src/components/settings/wizard/Step4Validation.tsx
@@ -139,7 +139,6 @@ export default function Step4Validation({
       }
 
       try {
-        // Query the specific go2rtc stream we just created
         const response = await axios.get<LiveStreamMetadata>(
           `go2rtc/streams/${go2rtcStreamId}`,
         );
diff --git a/web/src/views/live/LiveCameraView.tsx b/web/src/views/live/LiveCameraView.tsx
index 679db89d1..a9c62f623 100644
--- a/web/src/views/live/LiveCameraView.tsx
+++ b/web/src/views/live/LiveCameraView.tsx
@@ -169,12 +169,8 @@ export default function LiveCameraView({
     },
   );
 
-  const audioFeatures = useMemo(() => {
-    return detectCameraAudioFeatures(cameraMetadata);
-  }, [cameraMetadata]);
-
-  const supports2WayTalk = audioFeatures.twoWayAudio;
-  const supportsAudioOutput = audioFeatures.audioOutput;
+  const { twoWayAudio: supports2WayTalk, audioOutput: supportsAudioOutput } =
+    useMemo(() => detectCameraAudioFeatures(cameraMetadata), [cameraMetadata]);
 
   // camera enabled state
   const { payload: enabledState } = useEnabledState(camera.name);