diff --git a/data/templates/nginx/yunohost_admin.conf.inc b/data/templates/nginx/yunohost_admin.conf.inc
index 736102944..b0ab4cef6 100644
--- a/data/templates/nginx/yunohost_admin.conf.inc
+++ b/data/templates/nginx/yunohost_admin.conf.inc
@@ -2,4 +2,10 @@ location /yunohost/admin {
     alias /usr/share/yunohost/admin/;
     default_type text/html;
     index index.html;
+
+    # Short cache on handlebars templates
+    location ~* \.(?:ms)$ {
+      expires 5m;
+      add_header Cache-Control "public";
+    }
 }