diff --git a/core/Controller/OCSController.php b/core/Controller/OCSController.php
index 7ed43fc600..057dee7867 100644
--- a/core/Controller/OCSController.php
+++ b/core/Controller/OCSController.php
@@ -108,7 +108,9 @@ class OCSController extends \OCP\AppFramework\OCSController {
 			$result['capabilities'] = $this->capabilitiesManager->getCapabilities(true);
 		}
 
-		return new DataResponse($result);
+		$response = new DataResponse($result);
+		$response->setETag(md5(json_encode($result)));
+		return $response;
 	}
 
 	/**
diff --git a/tests/Core/Controller/OCSControllerTest.php b/tests/Core/Controller/OCSControllerTest.php
index e860ff6d64..c7cf601282 100644
--- a/tests/Core/Controller/OCSControllerTest.php
+++ b/tests/Core/Controller/OCSControllerTest.php
@@ -113,6 +113,7 @@ class OCSControllerTest extends TestCase {
 		$result['capabilities'] = $capabilities;
 
 		$expected = new DataResponse($result);
+		$expected->setETag(md5(json_encode($result)));
 		$this->assertEquals($expected, $this->controller->getCapabilities());
 	}
 
@@ -146,6 +147,7 @@ class OCSControllerTest extends TestCase {
 		$result['capabilities'] = $capabilities;
 
 		$expected = new DataResponse($result);
+		$expected->setETag(md5(json_encode($result)));
 		$this->assertEquals($expected, $this->controller->getCapabilities());
 	}