diff --git a/bigbluebutton-html5/imports/ui/components/video-preview/styles.scss b/bigbluebutton-html5/imports/ui/components/video-preview/styles.scss
index b21e8649b2ef12679e1dcd8159a7d8afb27ece00..90ffd930baa713f6ee6259315729dbf70153b68b 100644
--- a/bigbluebutton-html5/imports/ui/components/video-preview/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/video-preview/styles.scss
@@ -17,6 +17,10 @@
   display: flex;
 
   width: 30%;
+  @include mq($small-only) {
+    width: 100%;
+  }
+
   height: 100%;
 
   margin-right: 1.5rem;
@@ -25,6 +29,10 @@
 .content {
   display: flex;
   flex: 3;
+
+  @include mq($small-only) {
+    flex-direction: column;
+  }
 }
 
 .footer {
@@ -55,6 +63,9 @@
   border-radius: 5px;
   width: 100%;
   height: 8rem;
+  @include mq($small-only) {
+    height: 100%;
+  }
 }
 
 .row {
diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/component.jsx b/bigbluebutton-html5/imports/ui/components/video-provider/component.jsx
index 59674e4eee28e966b746e0f4c2ec037a97b51e64..8270b76c43c03bb10d4410bb662c4e3bb6deb03b 100755
--- a/bigbluebutton-html5/imports/ui/components/video-provider/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/video-provider/component.jsx
@@ -176,6 +176,7 @@ class VideoProvider extends Component {
 
     window.removeEventListener('online', this.openWs);
     window.removeEventListener('offline', this.onWsClose);
+    window.removeEventListener('beforeunload', this.unshareWebcam);
 
     this.visibility.removeEventListeners();