diff --git a/conference.js b/conference.js
index 201174586..2a0470d84 100644
--- a/conference.js
+++ b/conference.js
@@ -539,7 +539,7 @@ export default {
         if (localVideo) {
             // this calls room.removeTrack internally
             // so we don't need to remove it manually
-            promise = localVideo.stop();
+            promise = localVideo.dispose();
         }
         localVideo = stream;
 
@@ -575,7 +575,7 @@ export default {
         if (localAudio) {
             // this calls room.removeTrack internally
             // so we don't need to remove it manually
-            promise = localAudio.stop();
+            promise = localAudio.dispose();
         }
         localAudio = stream;
 
@@ -612,7 +612,7 @@ export default {
         if (shareScreen) {
             createDesktopTrack().then(([stream]) => {
                 stream.on(
-                    TrackEvents.TRACK_STOPPED,
+                    TrackEvents.LOCAL_TRACK_STOPPED,
                     () => {
                         // if stream was stopped during screensharing session
                         // then we should switch to video
diff --git a/modules/UI/videolayout/LocalVideo.js b/modules/UI/videolayout/LocalVideo.js
index e339be4e2..c108e3252 100644
--- a/modules/UI/videolayout/LocalVideo.js
+++ b/modules/UI/videolayout/LocalVideo.js
@@ -193,9 +193,9 @@ LocalVideo.prototype.changeVideo = function (stream) {
     let endedHandler = () => {
         localVideoContainer.removeChild(localVideo);
         this.VideoLayout.updateRemovedVideo(this.id);
-        stream.off(TrackEvents.TRACK_STOPPED, endedHandler);
+        stream.off(TrackEvents.LOCAL_TRACK_STOPPED, endedHandler);
     };
-    stream.on(TrackEvents.TRACK_STOPPED, endedHandler);
+    stream.on(TrackEvents.LOCAL_TRACK_STOPPED, endedHandler);
 };
 
 export default LocalVideo;