diff --git a/lib/storage-leases.ts b/lib/storage-leases.ts
index 8b38161..c06dc8e 100644
--- a/lib/storage-leases.ts
+++ b/lib/storage-leases.ts
@@ -1,6 +1,7 @@
 import type { Kysely } from 'kysely'
 import type { Database, StorageReaderLeaseScope } from './db'
 import { randomUUID } from 'node:crypto'
+import { retryOnLockConflict } from './db'
 import { env } from './env'
 
 export const LEASE_DURATION_MS = 2 * 60 * 1000
@@ -86,5 +87,8 @@ export async function renewReaderLease(db: Kysely<Database>, id: string) {
 }
 
 export async function releaseReaderLease(db: Kysely<Database>, id: string) {
-  await db.deleteFrom('storage_reader_leases').where('id', '=', id).execute()
+  // races cascade deletes of the storage location, which lock rows in the opposite order
+  await retryOnLockConflict(() =>
+    db.deleteFrom('storage_reader_leases').where('id', '=', id).execute(),
+  )
 }
diff --git a/lib/storage.ts b/lib/storage.ts
index b33bd5d..e56d0f3 100644
--- a/lib/storage.ts
+++ b/lib/storage.ts
@@ -116,7 +116,10 @@ export class Storage {
       if (released) return
       released = true
       clearInterval(renewalTimer)
-      void releaseReaderLease(this.db, readerLeaseId)
+      // an unreleased lease only delays cleanup until it expires
+      releaseReaderLease(this.db, readerLeaseId).catch((err) =>
+        logger.warn(`Failed to release Storage Reader Lease ${readerLeaseId}`, { error: err }),
+      )
     }
     stream.once('end', release)
     stream.once('close', release)