diff --git a/frontend/static/_headers b/frontend/static/_headers
new file mode 100644
index 0000000000000..1882a9b2112bd
--- /dev/null
+++ b/frontend/static/_headers
@@ -0,0 +1,3 @@
+/*
+  Cross-Origin-Opener-Policy: same-origin
+Cross-Origin-Embedder-Policy: require-corp
diff --git a/functions/api/[[path]].ts b/functions/api/[[path]].ts
index 1f4ed869537c1..8c7127b0d23e6 100644
--- a/functions/api/[[path]].ts
+++ b/functions/api/[[path]].ts
@@ -30,14 +30,7 @@ export async function onRequest(context) {
         ?.split("token")
         .pop() ?? ""
     );
-    newResponse.headers.set(
-      "Cross-Origin-Opener-Policy",
-      "same-origin"
-    );
-    newResponse.headers.set(
-      "Cross-Origin-Embedder-Policy",
-      "require-corp"
-    );
+
     return newResponse;
   } catch (e) {
     return new Response(e.message, { status: 500 });