diff --git a/bundles/matrix-synapse/files/homeserver.yaml b/bundles/matrix-synapse/files/homeserver.yaml
index afe2cf8..a754d88 100644
--- a/bundles/matrix-synapse/files/homeserver.yaml
+++ b/bundles/matrix-synapse/files/homeserver.yaml
@@ -72,6 +72,9 @@ trusted_key_servers:
 % for server in sorted(trusted_key_servers):
   - server_name: "${server}"
 % endfor
+% if 'matrix.org' in trusted_key_servers:
+suppress_key_server_warning: true
+%endif
 
 password_config:
    enabled: true