diff --git a/roles/matrix-riot-web/templates/nginx.conf.j2 b/roles/matrix-riot-web/templates/nginx.conf.j2
index a7707cd9c..84789954d 100644
--- a/roles/matrix-riot-web/templates/nginx.conf.j2
+++ b/roles/matrix-riot-web/templates/nginx.conf.j2
@@ -47,11 +47,16 @@ http {
 		listen 8080;
 		server_name localhost;
 
+		root /usr/share/nginx/html;
+
 		location / {
-			root /usr/share/nginx/html;
 			index index.html index.htm;
 		}
 
+		location ~* ^/(config(.+)?\.json$|(.+)\.html$|i18n) {
+			expires -1;
+		}
+
 		error_page 500 502 503 504 /50x.html;
 		location = /50x.html {
 			root /usr/share/nginx/html;