diff --git a/bigbluebutton-html5/imports/ui/components/video-dock/component.jsx b/bigbluebutton-html5/imports/ui/components/video-dock/component.jsx
index 67d5af0b07fa00734d0f7fde787a63d021625c7c..90b99681484d3d8a8d88aa2a5c0c3360b690f49c 100755
--- a/bigbluebutton-html5/imports/ui/components/video-dock/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/video-dock/component.jsx
@@ -287,6 +287,7 @@ class VideoDock extends Component {
       if (that.myId == id) {
         that.notifyError(intl.formatMessage(intlMessages.sharingError));
         that.unshareWebcam();
+        that.stop(id);
       } else {
         that.stop(id);
         that.start(id, shareWebcam);
@@ -587,8 +588,9 @@ class VideoDock extends Component {
     const { intl, userId } = this.props;
 
     if (message.cameraId == userId) {
-      this.unshareWebcam();
       this.notifyError(intl.formatMessage(intlMessages.sharingError));
+      this.unshareWebcam();
+      this.stop(userId);
     } else {
       this.stop(message.cameraId);
     }