diff --git a/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/organisms/AudioRecordingStatus.kt b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/organisms/AudioRecordingStatus.kt
index c302f24..664cc38 100644
--- a/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/organisms/AudioRecordingStatus.kt
+++ b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/organisms/AudioRecordingStatus.kt
@@ -163,7 +163,7 @@ fun _PrimitiveControls(audioRecorder: AudioRecorderModel) {
             scope.launch {
                 audioRecorder.recorderService!!.startNewCycle()
 
-                audioRecorder.onRecordingSave(true).join()
+                audioRecorder.onRecordingSave(false).join()
             }
         },
     )
diff --git a/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/organisms/RecorderEventsHandler.kt b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/organisms/RecorderEventsHandler.kt
index 1af0f86..6db673d 100644
--- a/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/organisms/RecorderEventsHandler.kt
+++ b/app/src/main/java/app/myzel394/alibi/ui/components/RecorderScreen/organisms/RecorderEventsHandler.kt
@@ -138,7 +138,9 @@ fun RecorderEventsHandler(
         return thread {
             runBlocking {
                 try {
-                    recorder.recorderService?.lockFiles()
+                    if (recorder.isCurrentlyActivelyRecording) {
+                        recorder.recorderService?.lockFiles()
+                    }
 
                     val recording =
                         // When new recording created
@@ -217,7 +219,9 @@ fun RecorderEventsHandler(
                 } catch (error: Exception) {
                     Log.getStackTraceString(error)
                 } finally {
-                    recorder.recorderService?.unlockFiles(cleanupOldFiles)
+                    if (recorder.isCurrentlyActivelyRecording) {
+                        recorder.recorderService?.unlockFiles(cleanupOldFiles)
+                    }
                     isProcessing = false
                 }
             }
diff --git a/app/src/main/java/app/myzel394/alibi/ui/models/BaseRecorderModel.kt b/app/src/main/java/app/myzel394/alibi/ui/models/BaseRecorderModel.kt
index e55ec83..7796849 100644
--- a/app/src/main/java/app/myzel394/alibi/ui/models/BaseRecorderModel.kt
+++ b/app/src/main/java/app/myzel394/alibi/ui/models/BaseRecorderModel.kt
@@ -32,6 +32,9 @@ abstract class BaseRecorderModel<I, B : BatchesFolder, T : IntervalRecorderServi
     open val isInRecording: Boolean
         get() = recorderService != null
 
+    open val isCurrentlyActivelyRecording
+        get() = recorderState === RecorderState.RECORDING
+
     val isPaused: Boolean
         get() = recorderState === RecorderState.PAUSED