diff --git a/lib/private/connector/sabre/filesplugin.php b/lib/private/connector/sabre/filesplugin.php
index 1b4b0674a5..e03cac9c53 100644
--- a/lib/private/connector/sabre/filesplugin.php
+++ b/lib/private/connector/sabre/filesplugin.php
@@ -184,8 +184,11 @@ class FilesPlugin extends \Sabre\DAV\ServerPlugin {
 	/**
 	 * @param \OC\Connector\Sabre\Node $node
 	 */
-	public function getETag($node) {
-		if (isset($_SERVER['HTTP_OC_CHUNKED']) && !isset($_SERVER['X-CHUNKING_COMPLETE'])) {
+	private function getETag($node) {
+		if (isset($_SERVER['HTTP_OC_CHUNKED'])) {
+			if (isset($_SERVER['X-CHUNKING_COMPLETE'])) {
+				return $node->getETag();
+			}
 			return null;
 		}
 		return $node->getETag();
diff --git a/tests/lib/connector/sabre/filesplugin.php b/tests/lib/connector/sabre/filesplugin.php
index e10d67a325..54d43d66dd 100644
--- a/tests/lib/connector/sabre/filesplugin.php
+++ b/tests/lib/connector/sabre/filesplugin.php
@@ -171,35 +171,4 @@ class FilesPlugin extends \Test\TestCase {
 		$this->assertEquals(200, $result[self::GETETAG_PROPERTYNAME]);
 	}
 
-	/**
-	 * @dataProvider providesETagTestData
-	 * @param $expectedETag
-	 * @param $isChunked
-	 * @param $isChunkComplete
-	 */
-	public function testETag($expectedETag, $isChunked, $isChunkComplete) {
-		if (!is_null($isChunked)) {
-			$_SERVER['HTTP_OC_CHUNKED'] = $isChunked;
-		}
-		if (!is_null($isChunkComplete)) {
-			$_SERVER['X-CHUNKING_COMPLETE'] = $isChunkComplete;
-		}
-		$node = $this->createTestNode('\OC\Connector\Sabre\File');
-
-		$etag = $this->plugin->getETag($node);
-
-		$this->assertEquals($expectedETag, $etag);
-	}
-
-	public function providesETagTestData() {
-		return [
-			// non-chunked tests
-			['"abc"', null, null],
-			['"abc"', null, false],
-
-			// chunked tests
-			[null, true, null],
-			['"abc"', true, true],
-		];
-	}
 }