diff --git a/gui/js/proxy.js b/gui/js/proxy.js
index b646f153d..ca4091599 100644
--- a/gui/js/proxy.js
+++ b/gui/js/proxy.js
@@ -86,6 +86,17 @@ const setup = async (
     callback(-3) // use chrome validation
   })
 
+  // It's unclear if this actually works or not especially since we can't
+  // control that the Cache-Control header is really set.
+  // See https://github.com/electron/electron/issues/27895.
+  syncSession.webRequest.onHeadersReceived(
+    ({ statusLine, responseHeaders }, callback) => {
+      responseHeaders['Cache-Control'] = ['no-store']
+      statusLine += ' NO CACHE'
+      callback({ responseHeaders, statusLine })
+    }
+  )
+
   app.on(
     'select-client-certificate',
     (event, webContents, url, list, callback) => {
diff --git a/test/unit/gui/proxy.js b/test/unit/gui/proxy.js
index 1bd22d8a2..274f46057 100644
--- a/test/unit/gui/proxy.js
+++ b/test/unit/gui/proxy.js
@@ -122,11 +122,26 @@ describe('gui/js/proxy', function() {
 
       describe('fetch()', () => {
         describe('HTTP', () => {
-          beforeEach(() => global.fetch(httpUrl()))
+          let response
+          beforeEach(async () => {
+            response = await global.fetch(httpUrl())
+          })
 
           it('sets User-Agent', async () => {
             should(received.headers['user-agent']).equal(userAgent)
           })
+
+          // FIXME: Returned response headers only contain the raw headers which
+          // are not modified by calls to onHeadersReceived.
+          // See https://github.com/electron/electron/issues/27895
+          //
+          // This means we can't see if the Cache-Control header is actually
+          // set.
+          // But it should still be interpreted by Chromium.
+          it.skip('sets reponse Cache-Control header to no-store', async () => {
+            // Prevent Chromium from caching requests to avoid net error loops
+            should(response.headers['Cache-Control']).equal('no-store')
+          })
         })
 
         // TODO: fetch + self-signed pfx
diff --git a/test/unit/remote/cozy.js b/test/unit/remote/cozy.js
index a770d536d..6e357a843 100644
--- a/test/unit/remote/cozy.js
+++ b/test/unit/remote/cozy.js
@@ -606,7 +606,9 @@ describe('RemoteCozy', function() {
 
     const stubWarningsResponse = (status /*: number */, data) => {
       cozyStackDouble.stub((req, res) => {
-        if (req.url === '/status/') res.end('{}')
+        // A strict equality check would prevent us from adding query-string
+        // parameters to the request.
+        if (req.url.includes('/status/')) res.end('{}')
         else {
           res.writeHead(status)
           res.end(JSON.stringify(data))