diff --git a/daemon.py b/daemon.py
index 99e9006a4..22f46b75a 100644
--- a/daemon.py
+++ b/daemon.py
@@ -608,7 +608,7 @@ class PubServer(BaseHTTPRequestHandler):
                          'title="Login to Epicyon", Basic realm="epicyon"')
         self.send_header('X-Robots-Tag',
                          'noindex, nofollow, noarchive, nosnippet')
-        self.send_header('Cache-Control', 'public')
+        # self.send_header('Cache-Control', 'public')
         # self.send_header('Referrer-Policy', 'origin')
         self.end_headers()
 
@@ -623,7 +623,7 @@ class PubServer(BaseHTTPRequestHandler):
                          'title="Login to Epicyon", Basic realm="epicyon"')
         self.send_header('X-Robots-Tag',
                          'noindex, nofollow, noarchive, nosnippet')
-        self.send_header('Cache-Control', 'public')
+        # self.send_header('Cache-Control', 'public')
         # self.send_header('Referrer-Policy', 'origin')
         self.end_headers()
 
@@ -641,7 +641,7 @@ class PubServer(BaseHTTPRequestHandler):
         self.send_header('Content-Length', '0')
         self.send_header('X-Robots-Tag',
                          'noindex, nofollow, noarchive, nosnippet')
-        self.send_header('Cache-Control', 'public')
+        # self.send_header('Cache-Control', 'public')
         # self.send_header('Referrer-Policy', 'origin')
         self.end_headers()
 
@@ -663,14 +663,14 @@ class PubServer(BaseHTTPRequestHandler):
         self.send_header('X-Robots-Tag',
                          'noindex, nofollow, noarchive, nosnippet')
         self.send_header('X-Clacks-Overhead', 'GNU Natalie Nguyen')
-        self.send_header('Cache-Control', 'public')
+        # self.send_header('Cache-Control', 'public')
         # self.send_header('Referrer-Policy', 'origin')
         self.send_header('Accept-Ranges', 'none')
 
     def _set_headers(self, fileFormat: str, length: int, cookie: str,
                      callingDomain: str) -> None:
         self._set_headers_base(fileFormat, length, cookie, callingDomain)
-        self.send_header('Cache-Control', 'public, max-age=0')
+        # self.send_header('Cache-Control', 'public, max-age=0')
         self.end_headers()
 
     def _set_headers_head(self, fileFormat: str, length: int, etag: str,
@@ -684,7 +684,7 @@ class PubServer(BaseHTTPRequestHandler):
                           data, cookie: str, callingDomain: str) -> None:
         datalen = len(data)
         self._set_headers_base(fileFormat, datalen, cookie, callingDomain)
-        self.send_header('Cache-Control', 'public, max-age=86400')
+        # self.send_header('Cache-Control', 'public, max-age=86400')
         etag = None
         if os.path.isfile(mediaFilename + '.etag'):
             try:
@@ -751,7 +751,7 @@ class PubServer(BaseHTTPRequestHandler):
         self.send_header('Content-Length', '0')
         self.send_header('X-Robots-Tag',
                          'noindex, nofollow, noarchive, nosnippet')
-        self.send_header('Cache-Control', 'public')
+        # self.send_header('Cache-Control', 'public')
         # self.send_header('Referrer-Policy', 'origin')
         self.end_headers()
 
@@ -774,7 +774,7 @@ class PubServer(BaseHTTPRequestHandler):
         self.send_header('Content-Length', msgLenStr)
         self.send_header('X-Robots-Tag',
                          'noindex, nofollow, noarchive, nosnippet')
-        self.send_header('Cache-Control', 'public')
+        # self.send_header('Cache-Control', 'public')
         # self.send_header('Referrer-Policy', 'origin')
         self.end_headers()
         if not self._write(msg):