diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php
index 21df67cf55..6066aed411 100644
--- a/lib/private/Files/View.php
+++ b/lib/private/Files/View.php
@@ -1137,7 +1137,13 @@ class View {
 			list($storage, $internalPath) = Filesystem::resolvePath($absolutePath . $postFix);
 			if ($run and $storage) {
 				if (in_array('write', $hooks) || in_array('delete', $hooks)) {
-					$this->changeLock($path, ILockingProvider::LOCK_EXCLUSIVE);
+					try {
+						$this->changeLock($path, ILockingProvider::LOCK_EXCLUSIVE);
+					} catch (LockedException $e) {
+						// release the shared lock we acquired before quiting
+						$this->unlockFile($path, ILockingProvider::LOCK_SHARED);
+						throw $e;
+					}
 				}
 				try {
 					if (!is_null($extraParam)) {
diff --git a/tests/lib/Files/ViewTest.php b/tests/lib/Files/ViewTest.php
index 97e3d42684..7a32736adb 100644
--- a/tests/lib/Files/ViewTest.php
+++ b/tests/lib/Files/ViewTest.php
@@ -1997,6 +1997,37 @@ class ViewTest extends \Test\TestCase {
 		$this->assertNull($this->getFileLockType($view, $path), 'File got unlocked after exception');
 	}
 
+	public function testLockBasicOperationUnlocksAfterLockException() {
+		$view = new View('/' . $this->user . '/files/');
+
+		$storage = new Temporary([]);
+
+		Filesystem::mount($storage, array(), $this->user . '/');
+
+		$storage->mkdir('files');
+		$storage->mkdir('files/dir');
+		$storage->file_put_contents('files/test.txt', 'blah');
+		$storage->getScanner()->scan('files');
+
+		// get a shared lock
+		$handle = $view->fopen('test.txt', 'r');
+
+		$thrown = false;
+		try {
+			// try (and fail) to get a write lock
+			$view->unlink('test.txt');
+		} catch (\Exception $e) {
+			$thrown = true;
+			$this->assertInstanceOf(LockedException::class, $e);
+		}
+		$this->assertTrue($thrown, 'Exception was rethrown');
+
+		// clean shared lock
+		fclose($handle);
+
+		$this->assertNull($this->getFileLockType($view, 'test.txt'), 'File got unlocked');
+	}
+
 	/**
 	 * Test locks for fopen with fclose at the end
 	 *