diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers
index 26e5b35f..4a3c1193 100755
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@@ -1840,7 +1840,7 @@ matrix_ssl_domains_to_obtain_certificates_for: |
     +
     ([matrix_server_fqn_dimension] if matrix_dimension_enabled else [])
     +
-    ([matrix_server_fqn_etherpad] if matrix_etherpad_enabled else [])
+    ([matrix_server_fqn_etherpad] if (matrix_etherpad_enabled and not matrix_dimension_enabled) else [])
     +
     ([matrix_server_fqn_bot_go_neb] if matrix_bot_go_neb_enabled else [])
     +