diff --git a/docs/getting_started/reverse_proxy/apache-httpd.md b/docs/getting_started/reverse_proxy/apache-httpd.md
index c9446ff87..29af32734 100644
--- a/docs/getting_started/reverse_proxy/apache-httpd.md
+++ b/docs/getting_started/reverse_proxy/apache-httpd.md
@@ -245,4 +245,4 @@ If you cannot connect to the site in your browser, the reverse proxy setup doesn
 
 If you can connect but your posts don't federate and your account cannot be found from elsewhere, check your logs. Federation is broken if you see messages attempting to read your profile (something like `level=INFO … method=GET statusCode=401 path=/users/your_username msg="Unauthorized: …"`) or post to your inbox (something like `level=INFO … method=POST statusCode=404 path=/your_username/inbox msg="Not Found: …"`). Double check the `ProxyPreserveHost` setting.
 
-If you can connect but you cannot authorize your account in a Mastodon client app, check your headers. Use `curl -I https://example.com` and look for the `Content-Security-Policy` header. If your webserver sets it, you might have to unset it. One way to do that is to use `Header unset Content-Security-Policy` in the Apache site config file (something like `example.com.conf`).
+If you can connect but you cannot authorize your account in a Mastodon client app, make sure you initiate login from the right domain. When using a [split domain](../../advanced/host-account-domain.md) setup, you have to initiate the login from the `host` domain, not the `account-domain`. GoToSocial sets a `Content-Security-Policy` header to counter XSS and data injection attacks. This header should be left untouched, so make sure your reverse proxy doesn't modify, override or unset it.
diff --git a/internal/middleware/extraheaders.go b/internal/middleware/extraheaders.go
index 802051e34..f584633fe 100644
--- a/internal/middleware/extraheaders.go
+++ b/internal/middleware/extraheaders.go
@@ -17,10 +17,17 @@
 
 package middleware
 
-import "github.com/gin-gonic/gin"
+import (
+	"codeberg.org/gruf/go-debug"
+	"github.com/gin-gonic/gin"
+)
 
 // ExtraHeaders returns a new gin middleware which adds various extra headers to the response.
 func ExtraHeaders() gin.HandlerFunc {
+	policy := "default-src 'self'"
+	if debug.DEBUG {
+		policy += " localhost:*"
+	}
 	return func(c *gin.Context) {
 		// Inform all callers which server implementation this is.
 		c.Header("Server", "gotosocial")
@@ -32,5 +39,7 @@ func ExtraHeaders() gin.HandlerFunc {
 		//
 		// See: https://github.com/patcg-individual-drafts/topics
 		c.Header("Permissions-Policy", "browsing-topics=()")
+		// Inform the browser we only load CSS/JS/media from the same domain
+		c.Header("Content-Security-Policy", policy)
 	}
 }