diff --git a/docs.json b/docs.json
index 035cebab9..a2c42fddf 100644
--- a/docs.json
+++ b/docs.json
@@ -2694,55 +2694,15 @@
                                   "ui-kit/angular/components/cometchat-group-member-item"
                                 ]
                               },
-                              {
-                                "group": "Message Header",
-                                "pages": [
-                                  "ui-kit/angular/components/cometchat-message-header"
-                                ]
-                              },
-                              {
-                                "group": "Search",
-                                "pages": [
-                                  "ui-kit/angular/components/cometchat-search"
-                                ]
-                              },
-                              {
-                                "group": "Message List",
-                                "pages": [
-                                  "ui-kit/angular/components/cometchat-message-list"
-                                ]
-                              },
-                              {
-                                "group": "Message Composer",
-                                "pages": [
-                                  "ui-kit/angular/components/cometchat-message-composer"
-                                ]
-                              },
-                              {
-                                "group": "Message Bubble",
-                                "pages": [
-                                  "ui-kit/angular/components/cometchat-message-bubble"
-                                ]
-                              },
-                              {
-                                "group": "Message Information",
-                                "pages": [
-                                  "ui-kit/angular/components/cometchat-message-information"
-                                ]
-                              },
-                              {
-                                "group": "Thread Header",
-                                "pages": [
-                                  "ui-kit/angular/components/cometchat-thread-header"
-                                ]
-                              },
-                              {
-                                "group": "Pinned & Saved",
-                                "pages": [
-                                  "ui-kit/angular/components/cometchat-pinned-messages",
-                                  "ui-kit/angular/components/cometchat-saved-messages"
-                                ]
-                              },
+                              "ui-kit/angular/components/cometchat-message-header",
+                              "ui-kit/angular/components/cometchat-search",
+                              "ui-kit/angular/components/cometchat-message-list",
+                              "ui-kit/angular/components/cometchat-message-composer",
+                              "ui-kit/angular/components/cometchat-message-bubble",
+                              "ui-kit/angular/components/cometchat-message-information",
+                              "ui-kit/angular/components/cometchat-thread-header",
+                              "ui-kit/angular/components/cometchat-pinned-messages",
+                              "ui-kit/angular/components/cometchat-saved-messages",
                               {
                                 "group": "Message Bubbles",
                                 "pages": [
diff --git a/ui-kit/angular/components/cometchat-message-list.mdx b/ui-kit/angular/components/cometchat-message-list.mdx
index 771b87374..91b033327 100644
--- a/ui-kit/angular/components/cometchat-message-list.mdx
+++ b/ui-kit/angular/components/cometchat-message-list.mdx
@@ -437,7 +437,7 @@ This section provides a complete reference of all @Input properties, @Output eve
 
 When the feature is enabled, the context menu carries a single follow/unfollow option immediately after **Reply in thread**, so the two thread actions stay together. Its title flips with the state: "Subscribe to thread" when the user does not follow the thread, "Unsubscribe from thread" when they do — the same wording the thread header's control uses.
 
-The option renders only when `enableThreadSubscription: true` is provided through [`COMETCHAT_GLOBAL_CONFIG`](/ui-kit/angular/customization/global-config#enablethreadsubscription) — the feature is **off by default** — and `hideThreadSubscriptionOption` is `false`.
+The option renders only when `enableThreadSubscription: true` is provided through `COMETCHAT_GLOBAL_CONFIG` — the feature is **off by default** — and `hideThreadSubscriptionOption` is `false`.
 
 ```html expandable
 <cometchat-message-list
diff --git a/ui-kit/angular/components/cometchat-search.mdx b/ui-kit/angular/components/cometchat-search.mdx
index f81563490..b293a2099 100644
--- a/ui-kit/angular/components/cometchat-search.mdx
+++ b/ui-kit/angular/components/cometchat-search.mdx
@@ -1,5 +1,5 @@
 ---
-title: "CometChatSearch"
+title: "Search"
 description: "A unified Angular search component for cross-entity search across conversations and messages with filter chips, scoped search, and template customization"
 ---
 
diff --git a/ui-kit/angular/components/cometchat-thread-header.mdx b/ui-kit/angular/components/cometchat-thread-header.mdx
index 6d2e1c7aa..35498b9bf 100644
--- a/ui-kit/angular/components/cometchat-thread-header.mdx
+++ b/ui-kit/angular/components/cometchat-thread-header.mdx
@@ -182,7 +182,7 @@ When thread subscription is enabled, the header's top bar carries an icon-only b
 
 The control renders only when **all** of the following hold:
 
-1. `enableThreadSubscription: true` is provided through [`COMETCHAT_GLOBAL_CONFIG`](/ui-kit/angular/customization/global-config#enablethreadsubscription) — the feature is **off by default**
+1. `enableThreadSubscription: true` is provided through `COMETCHAT_GLOBAL_CONFIG` — the feature is **off by default**
 2. The installed Chat SDK exposes the thread API
 3. `hideThreadSubscriptionToggle` is `false`
 4. The server has not reported the thread as deleted or off-limits
diff --git a/ui-kit/angular/core-features.mdx b/ui-kit/angular/core-features.mdx
index 2f2983b94..9861f709d 100644
--- a/ui-kit/angular/core-features.mdx
+++ b/ui-kit/angular/core-features.mdx
@@ -131,9 +131,9 @@ Threaded Conversations enable users to respond directly to a specific message, k
 | [cometchat-message-list](/ui-kit/angular/components/cometchat-message-list) | Renders thread replies when `parentMessageId` is set. |
 | [cometchat-message-composer](/ui-kit/angular/components/cometchat-message-composer) | Sends replies within a thread when `parentMessageId` is set. |
 
-## Thread Subscription
+### Thread Subscription
 
-Thread Subscription lets a user follow one specific thread so they are notified about its replies, and unfollow when they no longer want them. It is per-user and per-thread, and is **off by default** — enable it with `enableThreadSubscription` in [Global Configuration](/ui-kit/angular/customization/global-config#enablethreadsubscription).
+Thread Subscription lets a user follow one specific thread so they are notified about its replies, and unfollow when they no longer want them. It is per-user and per-thread, and is **off by default** — enable it with `enableThreadSubscription` in `COMETCHAT_GLOBAL_CONFIG`.
 
 | Component | Functionality |
 | --- | --- |
diff --git a/ui-kit/angular/customization/global-config.mdx b/ui-kit/angular/customization/global-config.mdx
index 2ad5f8e8d..b6d983a58 100644
--- a/ui-kit/angular/customization/global-config.mdx
+++ b/ui-kit/angular/customization/global-config.mdx
@@ -106,7 +106,6 @@ import { COMETCHAT_GLOBAL_CONFIG } from '@cometchat/chat-uikit-angular';
 | `customSoundForCalls` | `string` | `undefined` | Custom sound URL for calls |
 | `customSoundForMessages` | `string` | `undefined` | Custom sound URL for messages |
 | `hideAvatar` | `boolean` | `undefined` | Hide avatar across components |
-| `enableThreadSubscription` | `boolean` | `undefined` (off) | Enable the thread follow/unfollow surfaces — the control in the thread header and the follow option in the message action sheet |
 | `enablePinMessage` | `boolean` | `undefined` | Force the Pin Message surfaces on or off, overriding the app-level flag the Chat SDK reports |
 | `enableSaveMessage` | `boolean` | `undefined` | Force the Save Message surfaces on or off, overriding the app-level flag the Chat SDK reports |
 | `callSettingsBuilder` | `CallSettingsBuilder` | `undefined` | Custom `CallSettingsBuilder` for call components (call buttons, call logs, ongoing call) |
@@ -117,22 +116,7 @@ import { COMETCHAT_GLOBAL_CONFIG } from '@cometchat/chat-uikit-angular';
 
 ## Feature Gates
 
-Three properties gate whole features rather than tune a component's appearance. They behave differently from the rest of the table, so they are worth calling out.
-
-### enableThreadSubscription
-
-Defaults to **off**. The backend exposes no capability flag a client could feature-detect from, so whether the threads endpoints are deployed is something only you know. When off, neither the thread header control nor the action-sheet option renders and no thread request is made — whatever the per-component `hideThreadSubscription*` inputs say.
-
-```typescript expandable
-{
-  provide: COMETCHAT_GLOBAL_CONFIG,
-  useValue: {
-    enableThreadSubscription: true,
-  } as GlobalConfig,
-}
-```
-
-See the [Thread Subscription guide](/ui-kit/angular/guides/thread-subscription).
+Two properties gate whole features rather than tune a component's appearance. They behave differently from the rest of the table, so they are worth calling out.
 
 ### enablePinMessage and enableSaveMessage
 
@@ -214,8 +198,7 @@ The following components read from `COMETCHAT_GLOBAL_CONFIG` and apply the three
 |-----------|----------------|
 | CometChatConversations | `hideReceipts`, `hideError`, `hideUserStatus`, `hideGroupType`, `showScrollbar`, `showSearchBar`, `disableSoundForMessages`, `textFormatters`, `customSoundForMessages`, `hideAvatar`, `disableDefaultContextMenu` |
 | CometChatMessageHeader | `hideUserStatus` |
-| CometChatMessageList | `hideReceipts`, `hideError`, `textFormatters`, `disableSoundForMessages`, `customSoundForMessages`, `disableDefaultContextMenu`, `enableThreadSubscription`, `enablePinMessage`, `enableSaveMessage` |
-| CometChatThreadHeader | `enableThreadSubscription` |
+| CometChatMessageList | `hideReceipts`, `hideError`, `textFormatters`, `disableSoundForMessages`, `customSoundForMessages`, `disableDefaultContextMenu`, `enablePinMessage`, `enableSaveMessage` |
 | CometChatMessageComposer | `textFormatters`, `disableSoundForMessages`, `customSoundForMessages` |
 | CometChatCallButtons |  `disableSoundForCalls`, `customSoundForCalls`, `callSettingsBuilder` |
 | CometChatCallLogs | `showScrollbar`, `callSettingsBuilder` |
diff --git a/ui-kit/angular/guides/threaded-messages.mdx b/ui-kit/angular/guides/threaded-messages.mdx
index 9d575bd00..aef0763d8 100644
--- a/ui-kit/angular/guides/threaded-messages.mdx
+++ b/ui-kit/angular/guides/threaded-messages.mdx
@@ -234,7 +234,7 @@ Users can also **subscribe** to a thread, so they keep getting notified about ne
 Both read the current state, flip it optimistically on click, and show a toast if the server rejects the change. No wiring is required to make them work.
 
 <Note>
-  Thread subscription is **off by default**. Turn it on with `enableThreadSubscription` in [Global Configuration](/ui-kit/angular/customization/global-config#enablethreadsubscription) — no backend capability flag exists for the kit to feature-detect from, so whether the thread endpoints are deployed for your app is something only you know.
+  Thread subscription is **off by default**. Turn it on with `enableThreadSubscription` in `COMETCHAT_GLOBAL_CONFIG` — no backend capability flag exists for the kit to feature-detect from, so whether the thread endpoints are deployed for your app is something only you know.
 </Note>
 
 To react to a change, handle `(threadSubscriptionChange)` on either surface: