diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers
index 685db733c..e7ef6da9a 100755
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@@ -2038,6 +2038,8 @@ matrix_bot_buscarron_container_labels_traefik_docker_network: "{{ matrix_playboo
 matrix_bot_buscarron_container_labels_traefik_entrypoints: "{{ devture_traefik_entrypoint_primary }}"
 matrix_bot_buscarron_container_labels_traefik_tls_certResolver: "{{ devture_traefik_certResolver_primary }}"
 
+matrix_bot_buscarron_homeserver: "{{ matrix_addons_homeserver_client_api_url }}"
+
 # Postgres is the default, except if not using internal Postgres server
 matrix_bot_buscarron_database_engine: "{{ 'postgres' if devture_postgres_enabled else 'sqlite' }}"
 matrix_bot_buscarron_database_hostname: "{{ devture_postgres_connection_hostname if devture_postgres_enabled else '' }}"
diff --git a/roles/custom/matrix-bot-buscarron/defaults/main.yml b/roles/custom/matrix-bot-buscarron/defaults/main.yml
index 40b968dcb..f06320ed4 100644
--- a/roles/custom/matrix-bot-buscarron/defaults/main.yml
+++ b/roles/custom/matrix-bot-buscarron/defaults/main.yml
@@ -140,7 +140,7 @@ matrix_bot_buscarron_login: "bot.buscarron"
 matrix_bot_buscarron_password: ''
 
 # the homeserver URL, uses internal synapse container address by default
-matrix_bot_buscarron_homeserver: "{{ matrix_homeserver_container_url }}"
+matrix_bot_buscarron_homeserver: ""
 
 # forms configuration
 matrix_bot_buscarron_forms: []
diff --git a/roles/custom/matrix-bot-buscarron/tasks/validate_config.yml b/roles/custom/matrix-bot-buscarron/tasks/validate_config.yml
index 51102b73e..0694a6578 100644
--- a/roles/custom/matrix-bot-buscarron/tasks/validate_config.yml
+++ b/roles/custom/matrix-bot-buscarron/tasks/validate_config.yml
@@ -9,3 +9,4 @@
     - {'name': 'matrix_bot_buscarron_password', when: true}
     - {'name': 'matrix_bot_buscarron_hostname', when: true}
     - {'name': 'matrix_bot_buscarron_database_hostname', when: "{{ matrix_bot_buscarron_database_engine == 'postgres' }}"}
+    - {'name': 'matrix_bot_buscarron_homeserver', when: true}