diff --git a/files/__main__.py b/files/__main__.py
index 4d9d2db33d..f2526c2f56 100644
--- a/files/__main__.py
+++ b/files/__main__.py
@@ -37,7 +37,7 @@ app.config['DATABASE_URL'] = environ.get("DATABASE_CONNECTION_POOL_URL",environ.
 
 app.config['SECRET_KEY'] = environ.get('MASTER_KEY')
 app.config["SERVER_NAME"] = environ.get("DOMAIN").strip()
-app.config['SEND_FILE_MAX_AGE_DEFAULT'] = 86400
+app.config['SEND_FILE_MAX_AGE_DEFAULT'] = 1
 
 app.config["SESSION_COOKIE_NAME"] = "session_" + environ.get("SITE_NAME").strip().lower()
 app.config["VERSION"] = "1.0.0"
diff --git a/files/routes/static.py b/files/routes/static.py
index d85635ade4..1c7e57ee25 100644
--- a/files/routes/static.py
+++ b/files/routes/static.py
@@ -135,6 +135,10 @@ def archives(path):
 def static_service(path):
 	resp = make_response(send_from_directory('./assets', path))
 	if request.path.endswith('.css'): resp.headers.add("Content-Type", "text/css")
+	if request.path.endswith('.gif') or request.path.endswith('.ttf') or request.path.endswith('.woff') or request.path.endswith('.woff2'):
+		resp.headers.remove("Cache-Control")
+		resp.headers.add("Cache-Control", "public, max-age=31556952")
+
 	return resp
 
 @app.get("/robots.txt")