diff --git a/lib/www/server/api/middleware/etag/cache.js b/lib/www/server/api/middleware/etag/cache.js
index df18002..1f733e5 100644
--- a/lib/www/server/api/middleware/etag/cache.js
+++ b/lib/www/server/api/middleware/etag/cache.js
@@ -30,11 +30,14 @@ function saveResponse (res) {
 	if (res?.headersSent) {
 		const etag = res.get("ETag");
 		if (etag && res.locals.saveEtag !== false) {
+			if (res.get("set-cookie")) {
+				// Do not save any responses containing cookies
+				return;
+			}
 			const cache = getCache(res);
 			const req = res.req;
 			console.log(`Saving ETag: ${req.method} ${req.url} → ${etag}`);
 			const headers = structuredClone(res.getHeaders());
-			delete headers["set-cookie"];
 			cache[req.url] = {etag, headers};
 		}
 	}