diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers
index 455feb4a7..bb2a857de 100755
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@@ -1351,6 +1351,8 @@ matrix_cactus_comments_systemd_required_services_list: |
     (['matrix-' + matrix_homeserver_implementation + '.service'])
   }}
 
+matrix_cactus_comments_client_nginx_path: {{ '/cactus-comments/' if matrix_nginx_proxy_enabled else matrix_cactus_comments_client_path + '/' }}
+
 ######################################################################
 #
 # /matrix-cactus-comments
diff --git a/roles/matrix-cactus-comments/defaults/main.yml b/roles/matrix-cactus-comments/defaults/main.yml
index 7243314d6..dbd5b8441 100644
--- a/roles/matrix-cactus-comments/defaults/main.yml
+++ b/roles/matrix-cactus-comments/defaults/main.yml
@@ -39,8 +39,12 @@ matrix_cactus_comments_client_version: "0.13.0"
 # provide the files locally / manually.
 matrix_cactus_comments_client_local_dir: ''
 
-matrix_cactus_comments_client_endpoint: "/cactus-comments/"
+# matrix_cactus_comments_client_nginx_path specifies the path where nginx can access the client files.
+# The default value assumes a container setup. If you're running nginx without a container, consider adjusting this path
+matrix_cactus_comments_client_nginx_path: "/cactus-comments/"
 
+# matrix_cactus_comments_client_endpoint specifies where nginx will serve the files in nginx is enabled
+matrix_cactus_comments_client_endpoint: "/cactus-comments/"
 
 # List of systemd services that matrix-cactus-comments.service depends on
 matrix_bot_cactus_comments_systemd_required_services_list: ['docker.service']