diff --git a/bootstrap/edge/main.tf b/bootstrap/edge/main.tf
index 19fac8b..96019a8 100644
--- a/bootstrap/edge/main.tf
+++ b/bootstrap/edge/main.tf
@@ -13,7 +13,8 @@ locals {
   heimdall_server_name  = "heimdall.${var.server_name}"
   heimdall_backend_host = var.heimdall_backend_host != "" ? var.heimdall_backend_host : var.gitea_backend_host
   server_names          = distinct(concat([var.server_name, local.heimdall_server_name], var.additional_server_names))
-  main_server_names     = [for name in local.server_names : name if name != local.heimdall_server_name]
+  matrix_server_names   = var.matrix_enabled ? [var.matrix_server_name, var.element_server_name] : []
+  main_server_names     = [for name in local.server_names : name if name != local.heimdall_server_name && !contains(local.matrix_server_names, name)]
   default_conf = templatefile("${path.module}/templates/default.conf.tftpl", {
     server_name           = var.server_name
     server_names          = join(" ", local.server_names)