diff --git a/source/configure/calls-deployment.rst b/source/configure/calls-deployment.rst
index 2377d3fd38f..630801a7f51 100644
--- a/source/configure/calls-deployment.rst
+++ b/source/configure/calls-deployment.rst
@@ -406,6 +406,23 @@ Can the traffic between Mattermost and ``rtcd``  be kept internal or should it b
 
 When possible, it's recommended to keep communication between the Mattermost cluster and the dedicated ``rtcd`` service under the same private network as this can greatly simplify deployment and security. There's no requirement to expose ``rtcd``'s HTTP API to the public internet.
 
+Can Calls be rolled out on a per-channel basis?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. include:: ../_static/badges/selfhosted-only.rst
+  :start-after: :nosearch:
+
+Yes. Mattermost system admins running self-hosted deployments can enable or disable call functionality per channel. Once :ref:`test mode <configure/plugins-configuration-settings:test mode>` is enabled for Mattermost Calls:
+
+- Select **Enable calls** for each channel where you want Calls enabled
+- Select **Disable calls** for all channels where you want Calls disabled. 
+
+Once Calls is enabled for specific channels, users can start making calls in those channels.
+
+.. note::
+
+  When :ref:`test mode <configure/plugins-configuration-settings:test mode>` is disabled for Mattermost Calls, users in any Mattermost channel can make a call.
+
 Troubleshooting
 ---------------
 
diff --git a/source/configure/plugins-configuration-settings.rst b/source/configure/plugins-configuration-settings.rst
index 82030e2b60a..47c729e4b09 100644
--- a/source/configure/plugins-configuration-settings.rst
+++ b/source/configure/plugins-configuration-settings.rst
@@ -398,7 +398,8 @@ Test mode
 | - **false**: All team members can start calls in channels.                                                                                 | - ``config.json`` setting: ``PluginSettings.Plugins.com.mattermost.calls.defaultenabled``                                                          |
 |                                                                                                                                            | - Environment variable: N/A                                                                                                                        |
 +--------------------------------------------------------------+-----------------------------------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------+
-| **Note**: Use this setting to confirm calls work as expected. When **true**, users attempting to start calls are prompted to contact System Admins. System Admins are prompted to confirm that calls are working as expected before switching to live mode.                                     |
+| **Note**: Use this setting to confirm calls work as expected, or to :ref:`enable Calls for specific Mattermost channels <configure/calls-deployment:can calls be rolled out on a per-channel basis?>`.                                                                                          | 
+| When **true**, users attempting to start calls are prompted to contact System Admins. System Admins are prompted to confirm that calls are working as expected before switching to live mode.                                                                                                   |
 +-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 
 .. config:setting:: plugins-callsicehost