diff --git a/server.js b/server.js
index 49385d74d..ddd2fcb88 100644
--- a/server.js
+++ b/server.js
@@ -85,9 +85,10 @@ var setHeaders = (function () {
     if (Object.keys(headers).length) {
         return function (req, res) {
             // apply a bunch of cross-origin headers for XLSX export in FF and printing elsewhere
+            /*
             applyHeaderMap(res, {
                 "Cross-Origin-Opener-Policy": /^\/(sheet|presentation|doc|convert)\//.test(req.url)? 'same-origin': '',
-            });
+            });*/
 
             if (Env.NO_SANDBOX) { // handles correct configuration for local development
             // https://stackoverflow.com/questions/11531121/add-duplicate-http-response-headers-in-nodejs
@@ -108,7 +109,7 @@ var setHeaders = (function () {
 
             // targeted CSP, generic policies, maybe custom headers
             const h = [
-                    /^\/common\/onlyoffice\/.*\/index\.html.*/,
+                    /^\/common\/onlyoffice\/.*\.html.*/,
                     /^\/(sheet|presentation|doc)\/inner\.html.*/,
                     /^\/unsafeiframe\/inner\.html.*$/,
                 ].some((regex) => {