diff --git a/roles/etherpad/templates/nginx-site.conf b/roles/etherpad/templates/nginx-site.conf
index 57a48b0..0bca61d 100644
--- a/roles/etherpad/templates/nginx-site.conf
+++ b/roles/etherpad/templates/nginx-site.conf
@@ -13,7 +13,6 @@ server {
 	{% endif %}
 
 	add_header Strict-Transport-Security "max-age=63072000; includeSubDomains; preload";
-	add_header X-Frame-Options DENY;
 	add_header X-Content-Type-Options nosniff;
 
 	location / {
diff --git a/roles/etherpad/templates/settings.json b/roles/etherpad/templates/settings.json
index e2e8818..8ff1889 100644
--- a/roles/etherpad/templates/settings.json
+++ b/roles/etherpad/templates/settings.json
@@ -69,7 +69,7 @@
   "allowUnknownFileEnds": true,
   "requireAuthentication": false,
   "requireAuthorization": false,
-  "trustProxy": false,
+  "trustProxy": true,
   "cookie": {
     "sameSite": "Lax"
   },