diff --git a/apps/dav/lib/Connector/Sabre/FilesPlugin.php b/apps/dav/lib/Connector/Sabre/FilesPlugin.php
index fee171a0f100d..a7ed68633c34c 100644
--- a/apps/dav/lib/Connector/Sabre/FilesPlugin.php
+++ b/apps/dav/lib/Connector/Sabre/FilesPlugin.php
@@ -34,9 +34,11 @@
 namespace OCA\DAV\Connector\Sabre;
 
 use OC\AppFramework\Http\Request;
+use OC\FilesMetadata\Model\MetadataValueWrapper;
 use OCP\Constants;
 use OCP\Files\ForbiddenException;
 use OCP\Files\StorageNotAvailableException;
+use OCP\FilesMetadata\IFilesMetadataManager;
 use OCP\IConfig;
 use OCP\IPreview;
 use OCP\IRequest;
@@ -516,6 +518,57 @@ public function handleUpdateProperties($path, PropPatch $propPatch) {
 			$node->setCreationTime((int) $time);
 			return true;
 		});
+
+
+		/** @var IFilesMetadataManager */
+		$filesMetadataManager = \OCP\Server::get(IFilesMetadataManager::class);
+		$metadata = $filesMetadataManager->getMetadata((int)$node->getFileId());
+
+		foreach ($metadata->getKeys() as $metadataKey) {
+			$propPatch->handle(self::FILE_METADATA_PREFIX.$metadataKey, function (mixed $value) use ($metadata, $metadataKey, $filesMetadataManager) {
+				switch ($metadata->getType($metadataKey)) {
+					case MetadataValueWrapper::TYPE_STRING:
+						$metadata->set($metadataKey, $value);
+						break;
+					case MetadataValueWrapper::TYPE_INT:
+						$metadata->setInt($metadataKey, $value);
+						break;
+					case MetadataValueWrapper::TYPE_FLOAT:
+						$metadata->setFloat($metadataKey, $value);
+						break;
+					case MetadataValueWrapper::TYPE_BOOL:
+						$metadata->setBool($metadataKey, $value);
+						break;
+					case MetadataValueWrapper::TYPE_ARRAY:
+						$metadata->setArray($metadataKey, $value);
+						break;
+					case MetadataValueWrapper::TYPE_STRING_LIST:
+						$metadata->setStringList($metadataKey, $value);
+						break;
+					case MetadataValueWrapper::TYPE_INT_LIST:
+						$metadata->setIntList($metadataKey, $value);
+						break;
+				}
+
+				$filesMetadataManager->saveMetadata($metadata);
+				return true;
+			});
+		}
+
+		foreach ($propPatch->getRemainingMutations() as $mutation) {
+			if (!str_starts_with($mutation, self::FILE_METADATA_PREFIX)) {
+				continue;
+			}
+
+			$propPatch->handle($mutation, function ($value) use ($metadata, $mutation, $filesMetadataManager) {
+				$metadataKey = substr($mutation, strlen(self::FILE_METADATA_PREFIX));
+				$metadata->set($metadataKey, $value);
+				$filesMetadataManager->saveMetadata($metadata);
+				return true;
+			});
+		}
+
+
 		/**
 		 * Disable modification of the displayname property for files and
 		 * folders via PROPPATCH. See PROPFIND for more information.
diff --git a/lib/public/Files/FileInfo.php b/lib/public/Files/FileInfo.php
index 5088458ef2d63..89c427ab876e3 100644
--- a/lib/public/Files/FileInfo.php
+++ b/lib/public/Files/FileInfo.php
@@ -28,6 +28,7 @@
  */
 namespace OCP\Files;
 
+use OC\FilesMetadata\Model\MetadataValueWrapper;
 use OCP\Files\Storage\IStorage;
 
 /**
@@ -312,7 +313,7 @@ public function getParentId(): int;
 	/**
 	 * Get the metadata, if available
 	 *
-	 * @return array
+	 * @return MetadataValueWrapper[]
 	 * @since 28.0.0
 	 */
 	public function getMetadata(): array;