diff --git a/app/src/RoomClient.js b/app/src/RoomClient.js
index 3d63d26..143aea9 100644
--- a/app/src/RoomClient.js
+++ b/app/src/RoomClient.js
@@ -3616,6 +3616,8 @@ export default class RoomClient
 
 		this._screenSharingProducer = null;
 
+		this._screenSharing.stop();
+
 		store.dispatch(meActions.setScreenShareInProgress(false));
 	}