diff --git a/src/room/InCallView.tsx b/src/room/InCallView.tsx
index e6a876cd..e67c3043 100644
--- a/src/room/InCallView.tsx
+++ b/src/room/InCallView.tsx
@@ -181,7 +181,7 @@ export function InCallView({
     containerRef1,
     toggleMicrophone,
     toggleCamera,
-    async (muted) => await localParticipant.setMicrophoneEnabled(!muted)
+    (muted) => muteStates.audio.setEnabled?.(!muted)
   );
 
   const onDisconnected = useCallback(
diff --git a/src/room/VideoPreview.tsx b/src/room/VideoPreview.tsx
index 75855486..37e997dc 100644
--- a/src/room/VideoPreview.tsx
+++ b/src/room/VideoPreview.tsx
@@ -71,6 +71,9 @@ export const VideoPreview: FC<Props> = ({ matrixInfo, muteStates }) => {
 
   const devices = useMediaDevices();
 
+  // Capture the audio options as they were when we first mounted, because
+  // we're not doing anything with the audio anyway so we don't need to
+  // re-open the devices when they change (see below).
   const initialAudioOptions = useRef<CreateLocalTracksOptions["audio"]>();
   initialAudioOptions.current ??= muteStates.audio.enabled && {
     deviceId: devices.audioInput.selectedId,
@@ -82,7 +85,9 @@ export const VideoPreview: FC<Props> = ({ matrixInfo, muteStates }) => {
       // request over with at the same time. But changing the audio settings
       // shouldn't cause this hook to recreate the track, which is why we
       // reference the initial values here.
-      audio: initialAudioOptions.current,
+      // We also pass in a clone because livekit mutates the object passed in,
+      // which would cause the devices to be re-opened on the next render.
+      audio: Object.assign({}, initialAudioOptions.current),
       video: muteStates.video.enabled && {
         deviceId: devices.videoInput.selectedId,
       },
diff --git a/src/video-grid/VideoTile.tsx b/src/video-grid/VideoTile.tsx
index 3433f8aa..ceaf7e1e 100644
--- a/src/video-grid/VideoTile.tsx
+++ b/src/video-grid/VideoTile.tsx
@@ -145,8 +145,6 @@ export const VideoTile = forwardRef<HTMLDivElement, Props>(
     // Firefox doesn't respect the disablePictureInPicture attribute
     // https://bugzilla.mozilla.org/show_bug.cgi?id=1611831
 
-    console.log(`LOG VideoTIle mxcSrc=${member?.getMxcAvatarUrl()}`);
-
     return (
       <animated.div
         className={classNames(styles.videoTile, className, {