diff --git a/changelog.d/2-features/pr-3202 b/changelog.d/2-features/pr-3202
new file mode 100644
index 0000000000..d4d09bd8c6
--- /dev/null
+++ b/changelog.d/2-features/pr-3202
@@ -0,0 +1 @@
+`conversations/join` endpoint rate limited per IP address
diff --git a/charts/nginz/templates/conf/_nginx.conf.tpl b/charts/nginz/templates/conf/_nginx.conf.tpl
index a0a1ae7f8d..13896d814f 100644
--- a/charts/nginz/templates/conf/_nginx.conf.tpl
+++ b/charts/nginz/templates/conf/_nginx.conf.tpl
@@ -259,7 +259,7 @@ http {
               {{- if ($location.unlimited_requests_endpoint) }}
                  # Note that this endpoint has no rate limit per user for authenticated requests
               {{- else }}
-                 limit_req zone=reqs_per_user burst=20 nodelay;
+        limit_req zone=reqs_per_user burst=20 nodelay;
               {{- end }}
             {{- end }}
 
diff --git a/charts/nginz/values.yaml b/charts/nginz/values.yaml
index b2e69396bb..e810b750d1 100644
--- a/charts/nginz/values.yaml
+++ b/charts/nginz/values.yaml
@@ -444,6 +444,11 @@ nginx_conf:
       - all
       doc: true
       oauth_scope: conversations_code
+    - path: /conversations/join
+      envs:
+      - all
+      specific_user_rate_limit: reqs_per_addr
+      specific_user_rate_limit_burst: "10"
     - path: /conversations
       envs:
       - all