diff --git a/ui/src/useRoom.ts b/ui/src/useRoom.ts
index 396ffdff..f2046e93 100644
--- a/ui/src/useRoom.ts
+++ b/ui/src/useRoom.ts
@@ -299,6 +299,7 @@ export const useRoom = (): UseRoom => {
         stream.current = await navigator.mediaDevices
             // @ts-ignore
             .getDisplayMedia({video: true});
+        stream.current?.getVideoTracks()[0].addEventListener('ended', () => stopShare());
         setState((current) => (current ? {...current, hostStream: stream.current} : current));
 
         conn.current?.send(JSON.stringify({type: 'share', payload: {}}));