diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index 7c49e5364..721a6685b 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -1920,6 +1920,7 @@ On QtWebKit, this setting is unavailable.
 [[content.mute]]
 === content.mute
 Automatically mute tabs.
+Note that if the :tab-mute command is used, the mute status for the affected tab is now controlled manually, and this setting doesn't have any effect.
 
 This setting supports URL patterns.
 
diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index 8f06814ca..5bd198a75 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -810,7 +810,12 @@ content.mute:
   default: false
   type: Bool
   supports_pattern: true
-  desc: Automatically mute tabs.
+  desc: >-
+    Automatically mute tabs.
+
+    Note that if the `:tab-mute` command is used, the mute status for the
+    affected tab is now controlled manually, and this setting doesn't have any
+    effect.
 
 # emacs: '