diff --git a/screenshare/src/screenshareApp.js b/screenshare/src/screenshareApp.js
index 4de36639dc..1cdc392fb6 100644
--- a/screenshare/src/screenshareApp.js
+++ b/screenshare/src/screenshareApp.js
@@ -190,6 +190,10 @@ function stopSharing() {
 
 // Callback to start publishing after we have setup the chromium stream
 function gotStream(stream) {
+    if (localStream) {
+        stopSharing();
+    }
+
     localStream = stream;
     startTokboxPublisher(localStream);
 
@@ -208,6 +212,9 @@ function onAccessApproved(desktop_id) {
         console.log('Desktop Capture access rejected.');
         return;
     }
+
+
+
     document.getElementById('screenshare').style.visibility = "block";
     desktopSharing = true;
     navigator.webkitGetUserMedia({