diff --git a/bigbluebutton-html5/imports/ui/components/video-preview/component.jsx b/bigbluebutton-html5/imports/ui/components/video-preview/component.jsx
index a4cf37443cc427d8dbc86a1290b9ddb23cf286de..fed89b40d6957a069acfb81d6c3a3a7236a5d0c7 100755
--- a/bigbluebutton-html5/imports/ui/components/video-preview/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/video-preview/component.jsx
@@ -515,7 +515,6 @@ class VideoPreview extends Component {
               value={webcamDeviceId || ''}
               className={styles.select}
               onChange={this.handleSelectWebcam}
-              disabled={this.skipVideoPreview}
             >
               {availableWebcams.map(webcam => (
                 <option key={webcam.deviceId} value={webcam.deviceId}>
@@ -548,7 +547,6 @@ class VideoPreview extends Component {
                     value={selectedProfile || ''}
                     className={styles.select}
                     onChange={this.handleSelectProfile}
-                    disabled={this.skipVideoPreview}
                   >
                     {availableProfiles.map((profile) => {
                       const label = intlMessages[`${profile.id}`]
@@ -719,6 +717,10 @@ class VideoPreview extends Component {
       return null;
     }
 
+    if (this.skipVideoPreview) {
+      return null;
+    }
+
     const {
       deviceError,
       previewError,
diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/video-button/component.jsx b/bigbluebutton-html5/imports/ui/components/video-provider/video-button/component.jsx
index 5b44dcb42a6daa78766f9b5de4b7dd252666093e..00dd815df4457f446249c99daefa020ebfd965b3 100755
--- a/bigbluebutton-html5/imports/ui/components/video-provider/video-button/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/video-provider/video-button/component.jsx
@@ -73,7 +73,7 @@ const JoinVideoButton = ({
   return (
     <Button
       label={label}
-      data-test="joinVideo"
+      data-test={hasVideoStream ? 'leaveVideo' : 'joinVideo'}
       className={cx(hasVideoStream || styles.btn)}
       onClick={handleOnClick}
       hideLabel