diff --git a/frontend/app/components/Session_/ScreenRecorder/ScreenRecorder.tsx b/frontend/app/components/Session_/ScreenRecorder/ScreenRecorder.tsx
index 97c3db78d..c52377400 100644
--- a/frontend/app/components/Session_/ScreenRecorder/ScreenRecorder.tsx
+++ b/frontend/app/components/Session_/ScreenRecorder/ScreenRecorder.tsx
@@ -90,6 +90,7 @@ function ScreenRecorder({
       );
       setRecording(true);
     } catch (e) {
+      stopRecordingHandler()
       console.error(e);
     }
   };
diff --git a/frontend/app/player/web/assist/ScreenRecording.ts b/frontend/app/player/web/assist/ScreenRecording.ts
index 933fcc02b..064e2e61c 100644
--- a/frontend/app/player/web/assist/ScreenRecording.ts
+++ b/frontend/app/player/web/assist/ScreenRecording.ts
@@ -54,9 +54,6 @@ export default class ScreenRecording {
   }
 
   stopRecording = () => {
-    const recordingState = this.store.get().recordingState
-    if (recordingState === SessionRecordingStatus.Off) return;
-
     this.socket.emit("stop_recording")
     this.toggleRecording(false)
   }