diff --git a/app/src/main/java/app/myzel394/alibi/helpers/BatchesFolder.kt b/app/src/main/java/app/myzel394/alibi/helpers/BatchesFolder.kt
index c32a294..e37d9c8 100644
--- a/app/src/main/java/app/myzel394/alibi/helpers/BatchesFolder.kt
+++ b/app/src/main/java/app/myzel394/alibi/helpers/BatchesFolder.kt
@@ -264,6 +264,9 @@ abstract class BatchesFolder(
     }
 
     fun deleteRecordings() {
+        // Currently deletes all recordings.
+        // This is fine, because we are saving the recordings
+        // in a dedicated subfolder
         when (type) {
             BatchType.INTERNAL -> getInternalFolder().deleteRecursively()
 
@@ -274,11 +277,13 @@ abstract class BatchesFolder(
 
             BatchType.MEDIA -> {
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                    // TODO: Also delete pending recordings
                     context.contentResolver.delete(
                         scopedMediaContentUri,
                         "${MediaStore.MediaColumns.DISPLAY_NAME} LIKE '$mediaPrefix%'",
                         null,
                     )
+
                 } else {
                     legacyMediaFolder.deleteRecursively()
                 }
@@ -337,15 +342,19 @@ abstract class BatchesFolder(
 
             BatchType.MEDIA -> {
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                    queryMediaContent { _, counter, uri, _ ->
+                    val deletableNames = mutableListOf<String>()
+
+                    queryMediaContent { rawName, counter, _, _ ->
                         if (counter < earliestCounter) {
-                            context.contentResolver.delete(
-                                uri,
-                                null,
-                                null,
-                            )
+                            deletableNames.add(rawName)
                         }
                     }
+
+                    context.contentResolver.delete(
+                        scopedMediaContentUri,
+                        "${MediaStore.MediaColumns.DISPLAY_NAME} IN (${deletableNames.joinToString(",")})",
+                        null,
+                    )
                 } else {
                     legacyMediaFolder.listFiles()?.forEach {
                         val fileCounter =
diff --git a/app/src/main/java/app/myzel394/alibi/helpers/VideoBatchesFolder.kt b/app/src/main/java/app/myzel394/alibi/helpers/VideoBatchesFolder.kt
index dd33595..64c6f0b 100644
--- a/app/src/main/java/app/myzel394/alibi/helpers/VideoBatchesFolder.kt
+++ b/app/src/main/java/app/myzel394/alibi/helpers/VideoBatchesFolder.kt
@@ -6,13 +6,16 @@ import android.os.Build
 import android.os.Environment
 import android.os.ParcelFileDescriptor
 import android.provider.MediaStore
+import androidx.core.net.toFile
 import androidx.documentfile.provider.DocumentFile
 import app.myzel394.alibi.helpers.MediaConverter.Companion.concatenateVideoFiles
 import app.myzel394.alibi.ui.RECORDER_INTERNAL_SELECTED_VALUE
 import app.myzel394.alibi.ui.RECORDER_MEDIA_SELECTED_VALUE
 import com.arthenica.ffmpegkit.FFmpegKitConfig
 import java.io.File
+import java.nio.file.Paths
 import java.time.LocalDateTime
+import kotlin.io.path.Path
 
 class VideoBatchesFolder(
     override val context: Context,
@@ -30,7 +33,7 @@ class VideoBatchesFolder(
     override val scopedMediaContentUri: Uri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI
     override val legacyMediaFolder = File(
         Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM),
-        MEDIA_SUBFOLDER
+        MEDIA_RECORDINGS_SUBFOLDER,
     )
 
     private var customParcelFileDescriptor: ParcelFileDescriptor? = null
@@ -56,7 +59,7 @@ class VideoBatchesFolder(
                     val mediaUri = getOrCreateMediaFile(
                         name = getName(date, extension),
                         mimeType = "video/$extension",
-                        relativePath = SCOPED_STORAGE_RELATIVE_PATH,
+                        relativePath = Environment.DIRECTORY_DCIM + MEDIA_SUBFOLDER,
                     )
 
                     return FFmpegKitConfig.getSafParameterForWrite(
@@ -64,12 +67,15 @@ class VideoBatchesFolder(
                         mediaUri
                     )!!
                 } else {
-                    return File(
-                        legacyMediaFolder.parentFile!!,
+                    return Paths.get(
+                        MediaStore.Video.Media.EXTERNAL_CONTENT_URI.path,
+                        Environment.DIRECTORY_DCIM,
+                        MEDIA_SUBFOLDER,
                         getName(date, extension)
-                    ).apply {
-                        createNewFile()
-                    }.absolutePath
+                    ).toFile()
+                        .apply {
+                            createNewFile()
+                        }.absolutePath
                 }
             }
         }
@@ -120,8 +126,9 @@ class VideoBatchesFolder(
             )
         }
 
-        val MEDIA_SUBFOLDER = "/alibi/.video_recordings"
-        val SCOPED_STORAGE_RELATIVE_PATH = Environment.DIRECTORY_DCIM + MEDIA_SUBFOLDER
+        val MEDIA_SUBFOLDER = "/alibi"
+        val MEDIA_RECORDINGS_SUBFOLDER = MEDIA_SUBFOLDER + "/video_recordings"
+        val SCOPED_STORAGE_RELATIVE_PATH = Environment.DIRECTORY_DCIM + MEDIA_RECORDINGS_SUBFOLDER
 
         // Parameters to be passed in descending order
         // Those parameters first try to concatenate without re-encoding