diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers
index 4441ca05..27f997e8 100755
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@@ -21,7 +21,13 @@ matrix_identity_server_url: "{{ ('https://' + matrix_server_fqn_matrix) if matri
 
 # If Synapse workers are enabled and matrix-nginx-proxy is disabled, certain APIs may not work over 'http://matrix-synapse:{{ matrix_synapse_container_client_api_port }}'.
 # This is because we explicitly disable them for the main Synapse process.
-matrix_homeserver_container_url: "{{ 'http://matrix-nginx-proxy:12080' if matrix_nginx_proxy_enabled else 'http://matrix-synapse:'+ matrix_synapse_container_client_api_port|string }}"
+matrix_homeserver_container_url: |-
+  {{
+    'http://matrix-nginx-proxy:12080' if matrix_nginx_proxy_enabled else {
+      'synapse': ('http://matrix-synapse:'+ matrix_synapse_container_client_api_port|string),
+      'dendrite': ('http://matrix-dendrite:' + matrix_dendrite_http_bind_port|string),
+    }[matrix_homeserver_implementation]
+  }}
 
 ######################################################################
 #