diff --git a/apps/dav/lib/Connector/Sabre/QuotaPlugin.php b/apps/dav/lib/Connector/Sabre/QuotaPlugin.php
index a41a4678f30dd..92f1f6e2e74fb 100644
--- a/apps/dav/lib/Connector/Sabre/QuotaPlugin.php
+++ b/apps/dav/lib/Connector/Sabre/QuotaPlugin.php
@@ -25,14 +25,10 @@
  *
  */
 namespace OCA\DAV\Connector\Sabre;
-use OCA\DAV\Files\FilesHome;
-use OCA\DAV\Upload\FutureFile;
-use OCA\DAV\Upload\UploadFolder;
 use OCP\Files\FileInfo;
 use OCP\Files\StorageNotAvailableException;
 use Sabre\DAV\Exception\InsufficientStorage;
 use Sabre\DAV\Exception\ServiceUnavailable;
-use Sabre\DAV\INode;
 use Sabre\HTTP\URLUtil;
 
 /**
@@ -44,7 +40,9 @@
  */
 class QuotaPlugin extends \Sabre\DAV\ServerPlugin {
 
-	/** @var \OC\Files\View */
+	/**
+	 * @var \OC\Files\View
+	 */
 	private $view;
 
 	/**
@@ -76,86 +74,26 @@ public function initialize(\Sabre\DAV\Server $server) {
 
 		$this->server = $server;
 
-		$server->on('beforeWriteContent', [$this, 'beforeWriteContent'], 10);
-		$server->on('beforeCreateFile', [$this, 'beforeCreateFile'], 10);
-		$server->on('beforeMove', [$this, 'beforeMove'], 10);
-	}
-
-	/**
-	 * Check quota before creating file
-	 *
-	 * @param string $uri target file URI
-	 * @param resource $data data
-	 * @param INode $parent Sabre Node
-	 * @param bool $modified modified
-	 */
-	public function beforeCreateFile($uri, $data, INode $parent, $modified) {
-		if (!$parent instanceof Node) {
-			return;
-		}
-
-		return $this->checkQuota($parent->getPath() . '/' . basename($uri));
-	}
-
-	/**
-	 * Check quota before writing content
-	 *
-	 * @param string $uri target file URI
-	 * @param INode $node Sabre Node
-	 * @param resource $data data
-	 * @param bool $modified modified
-	 */
-	public function beforeWriteContent($uri, INode $node, $data, $modified) {
-		if (!$node instanceof Node) {
-			return;
-		}
-
-		return $this->checkQuota($node->getPath());
+		$server->on('beforeWriteContent', array($this, 'checkQuota'), 10);
+		$server->on('beforeCreateFile', array($this, 'checkQuota'), 10);
 	}
 
-	/**
-	 * Check if we're moving a Futurefile in which case we need to check
-	 * the quota on the target destination.
-	 *
-	 * @param string $source source path
-	 * @param string $destination destination path
-	 */
-	public function beforeMove($source, $destination) {
-		$sourceNode = $this->server->tree->getNodeForPath($source);
-		if (!$sourceNode instanceof FutureFile) {
-			return;
-		}
-
-		// get target node for proper path conversion
-		if ($this->server->tree->nodeExists($destination)) {
-			$destinationNode = $this->server->tree->getNodeForPath($destination);
-			$path = $destinationNode->getPath();
-		} else {
-			$parentNode = $this->server->tree->getNodeForPath(dirname($destination));
-			$path = $parentNode->getPath();
-		}
-
-		return $this->checkQuota($path, $sourceNode->getSize());
-	}
-
-
 	/**
 	 * This method is called before any HTTP method and validates there is enough free space to store the file
 	 *
-	 * @param string $path relative to the users home
-	 * @param int $length
+	 * @param string $uri
 	 * @throws InsufficientStorage
 	 * @return bool
 	 */
-	public function checkQuota($path, $length = null) {
-		if ($length === null) {
-			$length = $this->getLength();
-		}
-
+	public function checkQuota($uri) {
+		$length = $this->getLength();
 		if ($length) {
-			list($parentPath, $newName) = \Sabre\Uri\split($path);
-			if(is_null($parentPath)) {
-				$parentPath = '';
+			if (substr($uri, 0, 1) !== '/') {
+				$uri = '/' . $uri;
+			}
+			list($parentUri, $newName) = \Sabre\Uri\split($uri);
+			if(is_null($parentUri)) {
+				$parentUri = '';
 			}
 			$req = $this->server->httpRequest;
 			if ($req->getHeader('OC-Chunked')) {
@@ -165,9 +103,9 @@ public function checkQuota($path, $length = null) {
 				// there is still enough space for the remaining chunks
 				$length -= $chunkHandler->getCurrentSize();
 				// use target file name for free space check in case of shared files
-				$path = rtrim($parentPath, '/') . '/' . $info['name'];
+				$uri = rtrim($parentUri, '/') . '/' . $info['name'];
 			}
-			$freeSpace = $this->getFreeSpace($path);
+			$freeSpace = $this->getFreeSpace($uri);
 			if ($freeSpace !== FileInfo::SPACE_UNKNOWN && $freeSpace !== FileInfo::SPACE_UNLIMITED && $length > $freeSpace) {
 				if (isset($chunkHandler)) {
 					$chunkHandler->cleanup();
diff --git a/apps/dav/lib/Connector/Sabre/ServerFactory.php b/apps/dav/lib/Connector/Sabre/ServerFactory.php
index c120b0be2e20d..329aa335ea495 100644
--- a/apps/dav/lib/Connector/Sabre/ServerFactory.php
+++ b/apps/dav/lib/Connector/Sabre/ServerFactory.php
@@ -161,7 +161,7 @@ public function createServer($baseUri,
 					!$this->config->getSystemValue('debug', false)
 				)
 			);
-			$server->addPlugin(new \OCA\DAV\Connector\Sabre\QuotaPlugin($view, true));
+			$server->addPlugin(new \OCA\DAV\Connector\Sabre\QuotaPlugin($view));
 
 			if($this->userSession->isLoggedIn()) {
 				$server->addPlugin(new \OCA\DAV\Connector\Sabre\TagsPlugin($objectTree, $this->tagManager));
diff --git a/apps/dav/lib/Server.php b/apps/dav/lib/Server.php
index 6f3ab3971eff0..ac0abc8b4eb4c 100644
--- a/apps/dav/lib/Server.php
+++ b/apps/dav/lib/Server.php
@@ -212,7 +212,7 @@ public function __construct(IRequest $request, $baseUri) {
 				);
 				if ($view !== null) {
 					$this->server->addPlugin(
-						new QuotaPlugin($view, false));
+						new QuotaPlugin($view));
 				}
 				$this->server->addPlugin(
 					new TagsPlugin(
diff --git a/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php
index d29080539e60c..6286362f47dc1 100644
--- a/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php
@@ -24,13 +24,7 @@
  *
  */
 namespace OCA\DAV\Tests\unit\Connector\Sabre;
-use OC\Files\View;
-use OCA\DAV\Connector\Sabre\Directory;
-use OCA\DAV\Connector\Sabre\QuotaPlugin;
-use OCA\DAV\Files\FilesHome;
 use OCP\Files\FileInfo;
-use Sabre\DAV\Exception\InsufficientStorage;
-use Sabre\DAV\Tree;
 use Test\TestCase;
 
 /**
@@ -50,7 +44,7 @@ class QuotaPluginTest extends TestCase {
 	private function init($quota, $checkedPath = '') {
 		$view = $this->buildFileViewMock($quota, $checkedPath);
 		$this->server = new \Sabre\DAV\Server();
-		$this->plugin = $this->getMockBuilder(QuotaPlugin::class)
+		$this->plugin = $this->getMockBuilder('\OCA\DAV\Connector\Sabre\QuotaPlugin')
 			->setConstructorArgs([$view])
 			->setMethods(['getFileChunking'])
 			->getMock();
@@ -230,7 +224,7 @@ public function testCheckQuotaChunkedFail($quota, $chunkTotalSize, $headers) {
 
 	private function buildFileViewMock($quota, $checkedPath) {
 		// mock filesysten
-		$view = $this->getMockBuilder(View::class)
+		$view = $this->getMockBuilder('\OC\Files\View')
 			->setMethods(['free_space'])
 			->disableOriginalConstructor()
 			->getMock();
@@ -241,4 +235,5 @@ private function buildFileViewMock($quota, $checkedPath) {
 
 		return $view;
 	}
+
 }