diff --git a/templates/etc/nginx/sites-available/cryptpad.j2 b/templates/etc/nginx/sites-available/cryptpad.j2
index 790da4e..950be27 100644
--- a/templates/etc/nginx/sites-available/cryptpad.j2
+++ b/templates/etc/nginx/sites-available/cryptpad.j2
@@ -25,7 +25,7 @@
   add_header Access-Control-Allow-Origin "*";
 
   set $coop '';
-  if ($uri ~ ^\/sheet\/.*$) { set $coop 'same-origin'; }
+ if ($uri ~ ^\/(sheet|presentation|doc)\/.*$) { set $coop 'same-origin'; }
 
   # Enable SharedArrayBuffer in Firefox (for .xlsx export)
   add_header Cross-Origin-Resource-Policy cross-origin;
@@ -74,7 +74,7 @@
   set $unsafe 0;
   # the following assets are loaded via the sandbox domain
   # they unfortunately still require exceptions to the sandboxing to work correctly.
-  if ($uri = "/sheet/inner.html") { set $unsafe 1; }
+  if ($uri ~ ^\/(sheet|doc|presentation)\/inner.html.*$) { set $unsafe 1; }
   if ($uri ~ ^\/common\/onlyoffice\/.*\/index\.html.*$) { set $unsafe 1; }
 
   # everything except the sandbox domain is a privileged scope, as they might be used to handle keys
@@ -87,11 +87,10 @@
 
   # Finally, set all the rules you composed above.
   add_header Content-Security-Policy "default-src 'none'; child-src $childSrc; worker-src $workerSrc; media-src $mediaSrc; style-src $styleSrc; script-src $scriptSrc; connect-src $connectSrc; font-src $fontSrc; img-src $imgSrc; frame-src $frameSrc;";
-
 {% endblock %}
 
 {% block root %}
-  
+
     root {{ nginx_www_dir }}{{ item.root }};
     index index.html;
     error_page 404 /customize.dist/404.html;
@@ -127,7 +126,7 @@
   # /api/config is loaded once per page load and is used to retrieve
   # the caching variable which is applied to every other resource
   # which is loaded during that session.
-  location = /api/config {
+  location ~ ^/api/(config|broadcast).*$ {
     proxy_pass http://{{ item.proxy_pass }}:3000;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header Host $host;
@@ -137,13 +136,13 @@
   # encrypted blobs are immutable and are thus cached for a year
   location ^~ /blob/ {
     if ($request_method = 'OPTIONS') {
-      add_header 'Access-Control-Allow-Origin' '*';
-      add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
-      add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Content-Range,Range';
-      add_header 'Access-Control-Max-Age' 1728000;
-      add_header 'Content-Type' 'application/octet-stream; charset=utf-8';
-      add_header 'Content-Length' 0;
-      return 204;
+        add_header 'Access-Control-Allow-Origin' '*';
+        add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
+        add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Content-Range,Range';
+        add_header 'Access-Control-Max-Age' 1728000;
+        add_header 'Content-Type' 'application/octet-stream; charset=utf-8';
+        add_header 'Content-Length' 0;
+        return 204;
     }
     add_header Cache-Control max-age=31536000;
     add_header 'Access-Control-Allow-Origin' '*';
@@ -172,8 +171,7 @@
   # The nodejs server has some built-in forwarding rules to prevent
   # URLs like /pad from resulting in a 404. This simply adds a trailing slash
   # to a variety of applications.
-  location ~ ^/(register|login|settings|user|pad|drive|poll|slide|code|whiteboard|file|media|profile|contacts|todo|filepicker|debug|kanban|sheet|support|admin|notifications|teams)$ {
-    rewrite ^(.*)$ $1/ redirect;
+  location ~ ^/(register|login|settings|user|pad|drive|poll|slide|code|whiteboard|file|media|profile|contacts|todo|filepicker|debug|kanban|sheet|support|admin|notifications|teams|calendar|presentation|doc)$ {
+      rewrite ^(.*)$ $1/ redirect;
   }
 {% endblock %}
-