diff --git a/nginx/snippets/publik-wcs.conf b/nginx/snippets/publik-wcs.conf
index 8a12027..2821e25 100644
--- a/nginx/snippets/publik-wcs.conf
+++ b/nginx/snippets/publik-wcs.conf
@@ -4,7 +4,9 @@
 
 location ~ ^/static/(.+)$ {
     root /;
-    try_files /var/lib/wcs/$host/static/$1
+    try_files /var/lib/wcs/tenants/$host/static/$1
+              /var/lib/wcs/tenants/$host/theme/static/$1
+              /var/lib/wcs/$host/static/$1
               /var/lib/wcs/$host/theme/static/$1
               /var/lib/wcs/collectstatic/$1
               =404;
@@ -16,7 +18,9 @@ location ~ ^/static/(.+)$ {
 }
 
 location ~ ^/media/(.+)$ {
-    alias /var/lib/wcs/$host/media/$1;
+    try_files /var/lib/wcs/tenants/$host/media/$1
+              /var/lib/wcs/$host/media/$1
+              =404;
     add_header 'X-Content-Type-Options' 'nosniff';
     add_header 'X-XSS-Protection' '1; mode=block';
     add_header 'Content-Security-Policy' "default-src 'none'; style-src 'self' 'unsafe-inline'; object-src 'self' 'unsafe-inline'; img-src 'self' data:;";