diff --git a/conf/nginx.conf b/conf/nginx.conf
index a591ffb..4d3d417 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -5,8 +5,9 @@ location ~ ^/$ {
 }
 
 location /.well-known/matrix/server {
-	default_type application/json;
+    default_type application/json;
     return 200 '{ "m.server": "__DOMAIN__:443" }';
+    more_set_headers "Access-Control-Allow-Origin: *";
 }
 
 location /.well-known/matrix/client {
@@ -20,4 +21,5 @@ location /_matrix {
     proxy_set_header Host            $host;
     proxy_read_timeout               600;
     client_max_body_size             100M;
+    more_set_headers "Access-Control-Allow-Origin: *";
 }