diff --git a/apps/dav/lib/Connector/Sabre/AddExtraHeadersPlugin.php b/apps/dav/lib/Connector/Sabre/AddExtraHeadersPlugin.php
index e728c3f83b7..e31ba26bd95 100644
--- a/apps/dav/lib/Connector/Sabre/AddExtraHeadersPlugin.php
+++ b/apps/dav/lib/Connector/Sabre/AddExtraHeadersPlugin.php
@@ -40,6 +40,11 @@ class AddExtraHeadersPlugin extends \Sabre\DAV\ServerPlugin {
 			return;
 		}
 
+		// skip setting the headers if the PUT request failed
+		if ($response->getStatus() >= 400) {
+			return;
+		}
+
 		$node = null;
 		try {
 			$node = $this->server->tree->getNodeForPath($request->getPath());