diff --git a/lib/private/Files/Cache/Propagator.php b/lib/private/Files/Cache/Propagator.php
index 4a0c320340123..123da983c8ae2 100644
--- a/lib/private/Files/Cache/Propagator.php
+++ b/lib/private/Files/Cache/Propagator.php
@@ -59,6 +59,7 @@ public function propagateChange(string $internalPath, int $time, int $sizeDiffer
 		}
 
 		$parentHashes = array_map('md5', $parents);
+		sort($parentHashes); // Ensure rows are always locked in the same order
 		$etag = uniqid(); // since we give all folders the same etag we don't ask the storage for the etag
 
 		$builder = $this->connection->getQueryBuilder();
@@ -160,6 +161,9 @@ public function commitBatch(): void {
 		}
 		$this->inBatch = false;
 
+		// Ensure rows are always locked in the same order
+		uasort($this->batch, static fn (array $a, array $b) => $a['hash'] <=> $b['hash']);
+
 		try {
 			$this->connection->beginTransaction();