diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
index ce24a364b859c143058c7b1162be6eecf6c131ce..e55b04a5705654140c75b1daba1f492a2c62a203 100755
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
@@ -20,20 +20,21 @@ class ActionsBar extends PureComponent {
       isVideoBroadcasting,
     } = this.props;
 
-    if (!isThereCurrentPresentation && !isSharingVideo && !isVideoBroadcasting) {
-      if (!getSwapLayout()) {
-        toggleSwapLayout();
-      }
-    }
+    //  TODO: THIS BREAKS AUTO SWAP BIGLY AND SHOULD BE FIXED IN MEDIA CONTAINER
+    //    if (!isThereCurrentPresentation && !isSharingVideo && !isVideoBroadcasting) {
+    //      if (!getSwapLayout()) {
+    //        toggleSwapLayout();
+    //      }
+    //    }
 
-    if (!prevIsThereCurrPresentation
-      && isThereCurrentPresentation
-      && !isSharingVideo
-      && !isVideoBroadcasting) {
-      if (getSwapLayout()) {
-        toggleSwapLayout();
-      }
-    }
+    //    if (!prevIsThereCurrPresentation
+    //      && isThereCurrentPresentation
+    //      && !isSharingVideo
+    //      && !isVideoBroadcasting) {
+    //      if (getSwapLayout()) {
+    //        toggleSwapLayout();
+    //      }
+    //    }
   }
 
   render() {
diff --git a/bigbluebutton-html5/imports/ui/components/external-video-player/modal/component.jsx b/bigbluebutton-html5/imports/ui/components/external-video-player/modal/component.jsx
index 33846be63391165faa8e00da7c9a17246b61c943..d93b2158452cf8a8e0a866bf3693ceff2b8a01fc 100644
--- a/bigbluebutton-html5/imports/ui/components/external-video-player/modal/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/external-video-player/modal/component.jsx
@@ -60,14 +60,12 @@ class ExternalVideoModal extends Component {
     const {
       startWatching,
       closeModal,
-      toggleLayout,
       isSwapped,
     } = this.props;
 
     const { url } = this.state;
 
     startWatching(url.trim());
-    if (isSwapped) toggleLayout();
     closeModal();
   }
 
diff --git a/bigbluebutton-html5/imports/ui/components/external-video-player/modal/container.jsx b/bigbluebutton-html5/imports/ui/components/external-video-player/modal/container.jsx
index 6d53925557393181102f30c6008670aed277d97c..9df57b0e629180db7786d4ddce7960be7714c14b 100644
--- a/bigbluebutton-html5/imports/ui/components/external-video-player/modal/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/external-video-player/modal/container.jsx
@@ -3,7 +3,6 @@ import { withTracker } from 'meteor/react-meteor-data';
 import { withModalMounter } from '/imports/ui/components/modal/service';
 import ExternalVideoModal from './component';
 import { startWatching, getVideoUrl } from '../service';
-import mediaService from '/imports/ui/components/media/service';
 
 const ExternalVideoModalContainer = props => <ExternalVideoModal {...props} />;
 
@@ -13,6 +12,4 @@ export default withModalMounter(withTracker(({ mountModal }) => ({
   },
   startWatching,
   videoUrl: getVideoUrl(),
-  toggleLayout: mediaService.toggleSwapLayout,
-  isSwapped: mediaService.getSwapLayout(),
 }))(ExternalVideoModalContainer));