diff --git a/charts/dendrite/README.md b/charts/dendrite/README.md
index c6cc7a7ef..1344c1244 100644
--- a/charts/dendrite/README.md
+++ b/charts/dendrite/README.md
@@ -220,6 +220,7 @@ For more information see:
 | syncapi.config.search.index_path | string | `/var/dendrite/searchindex` | Where to store search index |
 | syncapi.config.search.language | string | `en` | Indexing language |
 | userapi | object | values.yaml | Configure the User API For more information see [the sample dendrite configuration](https://github.com/matrix-org/dendrite/blob/main/dendrite-sample.polylith.yaml) |
+| userapi.config.auto_join_rooms | list | `[]` | Automatically join users registered on this homeserver to following rooms |
 | userapi.config.bcrypt_cost | int | 10 | bcrypt cost (2^[cost] = rounds) |
 | userapi.database | object | See values.yaml | Override general dendrite.database parameters. |
 | userapi.database.conn_max_lifetime | string | dendrite.database.conn_max_lifetime | Maximum connection lifetime |
diff --git a/charts/dendrite/templates/dendrite-config.yaml b/charts/dendrite/templates/dendrite-config.yaml
index c4b592b3c..acfb9890d 100644
--- a/charts/dendrite/templates/dendrite-config.yaml
+++ b/charts/dendrite/templates/dendrite-config.yaml
@@ -207,6 +207,7 @@ stringData:
         conn_max_lifetime: {{ default .Values.dendrite.database.conn_max_lifetime .Values.userapi.database.conn_max_lifetime }}
       {{- end }}
       bcrypt_cost: {{ default 10 .Values.userapi.config.bcrypt_cost }}
+      auto_join_rooms: {{ .Values.userapi.config.auto_join_rooms }}
     tracing:
       enabled: {{ .Values.dendrite.tracing.enabled }}
       jaeger: {{- toYaml .Values.dendrite.tracing.jaeger | nindent 8 }}
diff --git a/charts/dendrite/values.yaml b/charts/dendrite/values.yaml
index 7761017cb..6c7b0b1e7 100644
--- a/charts/dendrite/values.yaml
+++ b/charts/dendrite/values.yaml
@@ -301,6 +301,8 @@ userapi:
     # -- bcrypt cost (2^[cost] = rounds)
     # @default -- 10
     bcrypt_cost: 10
+    auto_join_rooms: []
+    # - "#main:matrix.org"
 
 # -- Configure the Sync API
 # For more information see [the sample dendrite configuration](https://github.com/matrix-org/dendrite/blob/main/dendrite-sample.polylith.yaml)