diff --git a/drupal/rootfs/etc/nginx/shared/drupal.defaults.conf b/drupal/rootfs/etc/nginx/shared/drupal.defaults.conf
index 07329aaf..f960f4b7 100644
--- a/drupal/rootfs/etc/nginx/shared/drupal.defaults.conf
+++ b/drupal/rootfs/etc/nginx/shared/drupal.defaults.conf
@@ -85,6 +85,11 @@ location ~ ^(/[a-z\-]+)?/system/files/ { # For Drupal >= 7
     try_files $uri /index.php?$query_string;
 }
 
+# handle CSS/JS aggregation through Drupal
+location ~ ^/sites/.*/files/(css|js)/ {
+    try_files $uri /index.php?$query_string;
+}
+
 location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ {
     try_files $uri @rewrite;
     expires max;