diff --git a/docs/changes.rst b/docs/changes.rst
index e211141f19..461a274012 100644
--- a/docs/changes.rst
+++ b/docs/changes.rst
@@ -4,6 +4,9 @@ Changelog
 14.2.0 (unreleased)
 -------------------
 
+- Disable the cache control settings on the certificate pages.
+  Refs. `#475 <https://github.com/euphorie/Euphorie/issues/475>`_.
+  [ale-rt]
 - Upgrade Patternslib to 9.7.0-alpha.5
   [thet]
 - Export/import training questions
diff --git a/src/euphorie/client/browser/training.py b/src/euphorie/client/browser/training.py
index 753b7d1066..50546f8dc5 100644
--- a/src/euphorie/client/browser/training.py
+++ b/src/euphorie/client/browser/training.py
@@ -518,7 +518,12 @@ def __call__(self):
             if "risk_id" in reply:
                 self.handle_measure_configuration(reply)
 
-        self.request.RESPONSE.addHeader("Cache-Control", "public,max-age=60")
+        # XXX This is commented because it causes problems on logout, see:
+        # - https://github.com/euphorie/Euphorie/issues/475
+        #
+        # We should come out with a better solution that does not require setting
+        # the cache headers here.
+        # self.request.RESPONSE.addHeader("Cache-Control", "public,max-age=60")
         return self.index()