diff --git a/roles/matrix-base/templates/static-files/well-known/matrix-client.j2 b/roles/matrix-base/templates/static-files/well-known/matrix-client.j2
index 120f9c97..4e93c2d8 100644
--- a/roles/matrix-base/templates/static-files/well-known/matrix-client.j2
+++ b/roles/matrix-base/templates/static-files/well-known/matrix-client.j2
@@ -2,8 +2,10 @@
 {
 	"m.homeserver": {
 		"base_url": "{{ matrix_homeserver_url }}"
-	},
+	}
+	{% if matrix_identity_server_url %},
 	"m.identity_server": {
 		"base_url": "{{ matrix_identity_server_url }}"
 	}
+	{% endif %}
 }