diff --git a/changelog.d/4-docs/pr-2480 b/changelog.d/4-docs/pr-2480
new file mode 100644
index 0000000000..309e21c1ae
--- /dev/null
+++ b/changelog.d/4-docs/pr-2480
@@ -0,0 +1 @@
+Docs for guest links server and team feature settings added
diff --git a/docs/src/how-to/install/team-feature-settings.md b/docs/src/how-to/install/team-feature-settings.md
index bc6384e838..01e1a8497d 100644
--- a/docs/src/how-to/install/team-feature-settings.md
+++ b/docs/src/how-to/install/team-feature-settings.md
@@ -28,3 +28,26 @@ galley:
 ```
 
 Note that the lock status is required but has no effect, as it is currently not supported for team admins to enable or disable `sndFactorPasswordChallenge`. We recommend to set the lock status to `locked`.
+
+## Guest links
+
+The guest link feature is the ability for a Wire users to join a group conversation by tapping on a unique link generated by an admin of that group.
+
+The feature is enabled and unlocked by default and can be disabled on a per-team (via team management) basis or disabled and optionally locked for the entire backend (via Helm overrides). If the feature is locked, it cannot be enabled by team admins via team management.
+
+To change the configuration for the entire server, add the following to your Helm overrides in `values/wire-server/values.yaml`:
+
+```yaml
+galley:
+  # ...
+  config:
+    # ...
+    settings:
+      # ...
+      featureFlags:
+        # ...
+        conversationGuestLinks:
+          defaults:
+            status: disabled
+            lockStatus: locked            
+```