diff --git a/roles/matrix-riot-web/defaults/main.yml b/roles/matrix-riot-web/defaults/main.yml
index 05f6b796..cec6c8ea 100644
--- a/roles/matrix-riot-web/defaults/main.yml
+++ b/roles/matrix-riot-web/defaults/main.yml
@@ -17,6 +17,7 @@ matrix_riot_web_container_extra_arguments: []
 matrix_riot_web_systemd_required_services_list: ['docker.service']
 
 # Riot config.json customizations
+matrix_riot_web_default_server_name: "{{ matrix_domain }}"
 matrix_riot_web_default_hs_url: ""
 matrix_riot_web_default_is_url: ~
 matrix_riot_web_disable_custom_urls: true
diff --git a/roles/matrix-riot-web/templates/config.json.j2 b/roles/matrix-riot-web/templates/config.json.j2
index 6fc79077..16a0cf4c 100644
--- a/roles/matrix-riot-web/templates/config.json.j2
+++ b/roles/matrix-riot-web/templates/config.json.j2
@@ -2,6 +2,7 @@
 	"default_server_config": {
 		"m.homeserver": {
 			"base_url": {{ matrix_riot_web_default_hs_url|string|to_json }},
+			"server_name": {{ matrix_riot_web_default_server_name|string|to_json }}
 		},
 		"m.identity_server": {
 			"base_url": {{ matrix_riot_web_default_is_url|string|to_json }}