diff --git a/bigbluebutton-html5/imports/ui/components/media/webcam-draggable-overlay/component.jsx b/bigbluebutton-html5/imports/ui/components/media/webcam-draggable-overlay/component.jsx
index 7f7732b19b..3513d55524 100644
--- a/bigbluebutton-html5/imports/ui/components/media/webcam-draggable-overlay/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/media/webcam-draggable-overlay/component.jsx
@@ -184,6 +184,8 @@ export default class WebcamDraggableOverlay extends Component {
     });
 
     document.removeEventListener('webcamFullscreenButtonChange', this.fullscreenButtonChange);
+    document.removeEventListener('videoListUsersChange', this.getVideoListUsersChange);
+    document.removeEventListener('videoFocusChange', this.eventVideoFocusChangeListener);
   }
 
   getVideoListUsersChange() {
@@ -263,7 +265,6 @@ export default class WebcamDraggableOverlay extends Component {
       const {
         left: webcamLeft,
         top: webcamTop,
-        height: webcamHeight,
       } = webcamBySelectorRect;
 
       const mediaContainerRect = mediaContainer.getBoundingClientRect();