diff --git a/DEPLOY.md b/DEPLOY.md
index 3d4541ae..8dedad2d 100644
--- a/DEPLOY.md
+++ b/DEPLOY.md
@@ -96,6 +96,8 @@ allow_registration = false
 allow_encryption = true
 allow_federation = true
 
+trusted_servers = ["matrix.org"]
+
 #cache_capacity = 1073741824 # in bytes, 1024 * 1024 * 1024
 #max_concurrent_requests = 4 # How many requests Conduit sends to other servers at the same time
 #workers = 4 # default: cpu core count * 2
diff --git a/conduit-example.toml b/conduit-example.toml
index 87f959d7..6d39e30f 100644
--- a/conduit-example.toml
+++ b/conduit-example.toml
@@ -33,6 +33,8 @@ max_request_size = 20_000_000 # in bytes
 # Enable jaeger to support monitoring and troubleshooting through jaeger
 #allow_jaeger = false
 
+trusted_servers = ["matrix.org"]
+
 #cache_capacity = 1073741824 # in bytes, 1024 * 1024 * 1024
 #max_concurrent_requests = 4 # How many requests Conduit sends to other servers at the same time
 #log = "info,state_res=warn,rocket=off,_=off,sled=off"