diff --git a/bigbluebutton-html5/client/compatibility/kurento-extension.js b/bigbluebutton-html5/client/compatibility/kurento-extension.js
index ca1bf833755f89048deb0ff9b5209374706399ce..579de97651a56f37e930bfefbf877557287a66eb 100644
--- a/bigbluebutton-html5/client/compatibility/kurento-extension.js
+++ b/bigbluebutton-html5/client/compatibility/kurento-extension.js
@@ -280,6 +280,15 @@ Kurento.prototype.startScreenStreamFrom = function () {
 
     self.webRtcPeer.generateOffer(self.onOfferPresenter.bind(self));
     console.log("Generated peer offer w/ options "  + JSON.stringify(options));
+
+    const localStream = self.webRtcPeer.peerConnection.getLocalStreams()[0];
+    localStream.getVideoTracks()[0].onended = function () {
+      return kurentoManager.exitScreenShare();
+    };
+
+    localStream.getVideoTracks()[0].oninactive = function () {
+      return kurentoManager.exitScreenShare();
+    };
   });
 }