diff --git a/lib/Controller/NoteApiController.php b/lib/Controller/NoteApiController.php
index dbc1bc2..5e3eec3 100644
--- a/lib/Controller/NoteApiController.php
+++ b/lib/Controller/NoteApiController.php
@@ -54,14 +54,16 @@ class NoteApiController extends ApiController {
 	 */
 	public function index(): JSONResponse {
 		$notes = $this->noteService->getAll($this->userId);
-		$etag = md5(json_encode($notes));
+		if (count($notes) === 0) {
+			return new JSONResponse([]);
+		}
 
 		$lastModified = new \DateTime(null, new \DateTimeZone('GMT'));
 		$timestamp = max(array_map(function($note) { return $note->getTimestamp(); }, $notes));
 		$lastModified->setTimestamp($timestamp);
 
 		$response = new JSONResponse($notes);
-		$response->setETag($etag);
+		$response->setETag(md5(json_encode($notes)));
 		$response->setLastModified($lastModified);
 
 		return $response;
diff --git a/lib/Controller/NoteController.php b/lib/Controller/NoteController.php
index 476ab97..88dbfdc 100644
--- a/lib/Controller/NoteController.php
+++ b/lib/Controller/NoteController.php
@@ -52,14 +52,16 @@ class NoteController extends Controller {
 	 */
 	public function index(): JSONResponse {
 		$notes = $this->noteService->getAll($this->userId);
-		$etag = md5(json_encode($notes));
+		if (count($notes) === 0) {
+			return new JSONResponse([]);
+		}
 
 		$lastModified = new \DateTime(null, new \DateTimeZone('GMT'));
 		$timestamp = max(array_map(function($note) { return $note->getTimestamp(); }, $notes));
 		$lastModified->setTimestamp($timestamp);
 
 		$response = new JSONResponse($notes);
-		$response->setETag($etag);
+		$response->setETag(md5(json_encode($notes)));
 		$response->setLastModified($lastModified);
 
 		return $response;