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 ba394ef..873ca2c 100644
--- a/app/src/main/java/app/myzel394/alibi/helpers/BatchesFolder.kt
+++ b/app/src/main/java/app/myzel394/alibi/helpers/BatchesFolder.kt
@@ -419,11 +419,25 @@ abstract class BatchesFolder(
                         }
                     }
 
-                    context.contentResolver.delete(
-                        scopedMediaContentUri,
-                        "${MediaStore.MediaColumns.DISPLAY_NAME} IN (${deletableNames.joinToString(",")})",
-                        null,
-                    )
+                    try {
+                        context.contentResolver.delete(
+                            scopedMediaContentUri,
+                            "${MediaStore.MediaColumns.DISPLAY_NAME} IN (${
+                                deletableNames.joinToString(
+                                    ","
+                                ) { "'$it'" }
+                            })",
+                            null,
+                        )
+                        // This is unfortunate if the files can't be deleted, but let's just
+                        // ignore it since we can't do anything about it
+                    } catch (e: RuntimeException) {
+                        // Probably file not found
+                        e.printStackTrace()
+                    } catch (e: IllegalArgumentException) {
+                        // Strange filename, should not happen
+                        e.printStackTrace()
+                    }
                 } else {
                     // TODO: Fix "would you like to try saving" -> Save button
                     legacyMediaFolder.listFiles()?.forEach {