diff --git a/lib/private/files/cache/scanner.php b/lib/private/files/cache/scanner.php
index 12aa05277a..50609e1e20 100644
--- a/lib/private/files/cache/scanner.php
+++ b/lib/private/files/cache/scanner.php
@@ -357,6 +357,11 @@ class Scanner extends BasicEmitter {
 				// log and ignore
 				\OC_Log::write('core', 'Exception while scanning file "' . $child . '": ' . $ex->getMessage(), \OC_Log::DEBUG);
 				$exceptionOccurred = true;
+			} catch (\OCP\Lock\LockedException $e) {
+				if ($this->useTransactions) {
+					\OC_DB::rollback();
+				}
+				throw $e;
 			}
 		}
 		$removedChildren = \array_diff(array_keys($existingChildren), $newChildren);