diff --git a/src/room/MuteStates.ts b/src/room/MuteStates.ts
index 16ba171a..cae74dd9 100644
--- a/src/room/MuteStates.ts
+++ b/src/room/MuteStates.ts
@@ -131,8 +131,11 @@ export function useMuteStates(isJoined: boolean): MuteStates {
       // This allows to also use this action to just get the unaltered current state
       // by using a fromWidget request with: `ev.detail.data = {}`
       widget!.api.transport.reply(ev.detail, newState);
+      // We need to request the device names again, because otherwise iOS will
+      // not be able to switch to the correct device after un-muting
+      devices.requestDeviceNames();
     },
-    [audio, video],
+    [audio, devices, video],
   );
   useEffect(() => {
     // We setup a event listener for the widget action ElementWidgetActions.DeviceMute.
diff --git a/src/settings/SettingsModal.tsx b/src/settings/SettingsModal.tsx
index 00bdd1b8..376fdd64 100644
--- a/src/settings/SettingsModal.tsx
+++ b/src/settings/SettingsModal.tsx
@@ -129,7 +129,7 @@ export const SettingsModal: FC<Props> = ({
               }
             />
           )}
-          {iosDeviceMenu && (
+          {iosDeviceMenu && controlledAudioDevices && (
             <Button
               onClick={(e): void => {
                 e.preventDefault();