diff --git a/src/modules/alsa/mixer/paths/analog-output-headphones.conf b/src/modules/alsa/mixer/paths/analog-output-headphones.conf
index 3c62c5e67..821002780 100644
--- a/src/modules/alsa/mixer/paths/analog-output-headphones.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-headphones.conf
@@ -177,4 +177,11 @@ volume = off
 switch = off
 volume = off
 
+; Make sure the auto-mute becomes enabled if headphone is selected to be the active output port
+[Element Auto-Mute Mode]
+enumeration = select
+
+[Option Auto-Mute Mode:Enabled]
+name = analog-output-headphones
+
 .include analog-output.conf.common
diff --git a/src/modules/alsa/mixer/paths/analog-output-speaker.conf b/src/modules/alsa/mixer/paths/analog-output-speaker.conf
index 72f928fd9..493471b8f 100644
--- a/src/modules/alsa/mixer/paths/analog-output-speaker.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-speaker.conf
@@ -88,7 +88,7 @@ override-map.2 = all-left,all-right
 switch = off
 volume = off
 
-; Make sure the internal speakers are not auto-muted once the system has speakers
+; Make sure the auto-mute is disabled if the speakers are selected to be the active output port
 [Element Auto-Mute Mode]
 enumeration = select