diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers
index 96a72138d..5d45fb2e5 100755
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@@ -4221,6 +4221,8 @@ matrix_client_fluffychat_container_labels_traefik_tls_certResolver: "{{ traefik_
 
 matrix_client_fluffychat_self_check_validate_certificates: "{{ matrix_playbook_ssl_enabled }}"
 
+matrix_client_fluffychat_config_defaultHomeserver: "{{ matrix_domain }}"
+
 ######################################################################
 #
 # /matrix-client-fluffychat
diff --git a/roles/custom/matrix-client-fluffychat/defaults/main.yml b/roles/custom/matrix-client-fluffychat/defaults/main.yml
index 9c44771f7..a5c828e70 100644
--- a/roles/custom/matrix-client-fluffychat/defaults/main.yml
+++ b/roles/custom/matrix-client-fluffychat/defaults/main.yml
@@ -13,7 +13,7 @@ matrix_client_fluffychat_container_image_self_build_repo: "https://github.com/et
 matrix_client_fluffychat_container_image_self_build_version: "{{ 'main' if matrix_client_fluffychat_version == 'latest' else matrix_client_fluffychat_version }}"
 
 # renovate: datasource=docker depName=ghcr.io/etkecc/fluffychat-web
-matrix_client_fluffychat_version: v2.4.0
+matrix_client_fluffychat_version: v2.4.1
 matrix_client_fluffychat_docker_image: "{{ matrix_client_fluffychat_docker_image_registry_prefix }}etkecc/fluffychat-web:{{ matrix_client_fluffychat_version }}"
 matrix_client_fluffychat_docker_image_registry_prefix: "{{ 'localhost/' if matrix_client_fluffychat_container_image_self_build else matrix_client_fluffychat_docker_image_registry_prefix_upstream }}"
 matrix_client_fluffychat_docker_image_registry_prefix_upstream: "{{ matrix_client_fluffychat_docker_image_registry_prefix_upstream_default }}"
@@ -148,3 +148,6 @@ matrix_client_fluffychat_path_prefix: /
 
 # Controls whether the self-check feature should validate SSL certificates.
 matrix_client_fluffychat_self_check_validate_certificates: true
+
+# Controls the default homeserver domain (not URL) used in the FluffyChat Web configuration.
+matrix_client_fluffychat_config_defaultHomeserver: ~
diff --git a/roles/custom/matrix-client-fluffychat/tasks/setup_install.yml b/roles/custom/matrix-client-fluffychat/tasks/setup_install.yml
index 3fd3e71af..e938e9b95 100644
--- a/roles/custom/matrix-client-fluffychat/tasks/setup_install.yml
+++ b/roles/custom/matrix-client-fluffychat/tasks/setup_install.yml
@@ -58,6 +58,7 @@
     group: "{{ matrix_group_name }}"
   with_items:
     - {src: "{{ role_path }}/templates/labels.j2", name: "labels"}
+    - {src: "{{ role_path }}/templates/config.json.j2", name: "config.json"}
   when: "item.src is not none"
 
 - name: Ensure FluffyChat Web container network is created
diff --git a/roles/custom/matrix-client-fluffychat/templates/config.json.j2 b/roles/custom/matrix-client-fluffychat/templates/config.json.j2
new file mode 100644
index 000000000..120e3c46a
--- /dev/null
+++ b/roles/custom/matrix-client-fluffychat/templates/config.json.j2
@@ -0,0 +1,3 @@
+{
+	"defaultHomeserver": {{ matrix_client_fluffychat_config_defaultHomeserver | to_json }}
+}
diff --git a/roles/custom/matrix-client-fluffychat/templates/systemd/matrix-client-fluffychat.service.j2 b/roles/custom/matrix-client-fluffychat/templates/systemd/matrix-client-fluffychat.service.j2
index f7cbdaa1c..5f12bbfaa 100644
--- a/roles/custom/matrix-client-fluffychat/templates/systemd/matrix-client-fluffychat.service.j2
+++ b/roles/custom/matrix-client-fluffychat/templates/systemd/matrix-client-fluffychat.service.j2
@@ -25,6 +25,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
 			-p {{ matrix_client_fluffychat_container_http_host_bind_port }}:{{ matrix_client_fluffychat_container_http_port }} \
 			{% endif %}
 			--label-file={{ matrix_client_fluffychat_data_path }}/labels \
+			--mount type=bind,src={{ matrix_client_fluffychat_data_path }}/config.json,dst=/var/public/config.json,ro \
 			--tmpfs=/tmp:rw,noexec,nosuid,size=10m \
 			{% for arg in matrix_client_fluffychat_container_extra_arguments %}
 			{{ arg }} \