diff --git a/src/components/Recorder.tsx b/src/components/Recorder.tsx
index 0d59ac6..40bec3b 100644
--- a/src/components/Recorder.tsx
+++ b/src/components/Recorder.tsx
@@ -70,6 +70,11 @@ export default function Recorder({ closeModal, step, setStep }: Props) {
       .getVideoTracks()
       .forEach((track) => mediaStream.addTrack(track));
 
+    const firstVideoTrack = screenStream.getVideoTracks()[0];
+    if (firstVideoTrack) {
+      firstVideoTrack.addEventListener("ended", () => handleStop());
+    }
+
     setStream(mediaStream);
     recorderRef.current = new RecordRTC(mediaStream, { type: "video" });
     recorderRef.current.startRecording();