diff --git a/roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-synapse.conf.j2 b/roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-synapse.conf.j2
index 734ddb5b2..6417b77ce 100644
--- a/roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-synapse.conf.j2
+++ b/roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-synapse.conf.j2
@@ -110,6 +110,7 @@ server {
 		{% else %}
 			{# Generic configuration for use outside of our container setup #}
 			proxy_pass http://{{ matrix_nginx_proxy_proxy_matrix_client_api_addr_sans_container }};
+			resolver 127.0.0.1 ipv6=off;
 		{% endif %}
 
 		proxy_set_header Host $host;
diff --git a/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2 b/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2
index e6537ef09..2cca864ee 100644
--- a/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2
+++ b/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2
@@ -144,9 +144,7 @@ listeners:
     # On Linux and Mac OS, `::` will listen on all IPv4 and IPv6
     # addresses by default. For most other OSes, this will only listen
     # on IPv6.
-    bind_addresses:
-      - '::'
-      - '0.0.0.0'
+    bind_addresses: ['::']
 
     # This is a 'http' listener, allows us to specify 'resources'.
     type: http
@@ -174,7 +172,7 @@ listeners:
   # For when matrix traffic passes through loadbalancer that unwraps TLS.
   - port: 8008
     tls: false
-    bind_addresses: ['::', '0.0.0.0']
+    bind_addresses: ['::']
     type: http
 
     x_forwarded: true