diff --git a/bigbluebutton-html5/imports/ui/components/audio/audio-modal/component.jsx b/bigbluebutton-html5/imports/ui/components/audio/audio-modal/component.jsx
index 0f336dcd6ffcbe40a47f6421ea644e5944eaeaad..d6155fcb0be64234b4d817997e617ada7e886068 100755
--- a/bigbluebutton-html5/imports/ui/components/audio/audio-modal/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/audio/audio-modal/component.jsx
@@ -169,10 +169,9 @@ class AudioModal extends Component {
     } = this.props;
 
     if (!isUsingAudio) {
-      if (forceListenOnlyAttendee) return this.handleJoinListenOnly();
+      if (forceListenOnlyAttendee || audioLocked) return this.handleJoinListenOnly();
 
-      if ((joinFullAudioImmediately && !listenOnlyMode)
-        || audioLocked) return this.handleJoinMicrophone();
+      if (joinFullAudioImmediately && !listenOnlyMode) return this.handleJoinMicrophone();
     }
   }