diff --git a/CHANGES.md b/CHANGES.md
index d0215fd9e..cc3eafc4b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -7,6 +7,7 @@
 - Show roster contacts with `subscription` set to `none`
 - Remove the `converse-carbons` plugin and make carbons part of the `converse-chat` plugin.
 - Remove the `message_carbons` configuration setting. Carbons are now always enabled.
+- #2936: Fix documentation about enable_smacks option, which is true by default.
 
 ## 9.1.1 (2022-05-05)
 
diff --git a/docs/source/configuration.rst b/docs/source/configuration.rst
index 307238708..afe7901d2 100644
--- a/docs/source/configuration.rst
+++ b/docs/source/configuration.rst
@@ -902,7 +902,7 @@ The app servers are specified with the `push_app_servers`_ option.
 enable_smacks
 -------------
 
-* Default: ``false``
+* Default: ``true``
 
 Determines whether `XEP-0198 Stream Management <https://xmpp.org/extensions/xep-0198.html>`_
 support is turned on or not.