diff --git a/spa/plugins/alsa/alsa-acp-device.c b/spa/plugins/alsa/alsa-acp-device.c
index 44342a7a3..eb38b3f9e 100644
--- a/spa/plugins/alsa/alsa-acp-device.c
+++ b/spa/plugins/alsa/alsa-acp-device.c
@@ -990,11 +990,22 @@ static void card_port_available(void *data, uint32_t index,
 
 		for (i = 0; i < p->n_devices; i++) {
 			struct acp_device *d = p->devices[i];
+			struct acp_port *active_port = NULL;
+			uint32_t j;
 			uint32_t best;
 
 			if (!(d->flags & ACP_DEVICE_ACTIVE))
 				continue;
 
+			for (j = 0; j < d->n_ports; j++) {
+				if (d->ports[j]->flags & ACP_PORT_ACTIVE) {
+					active_port = d->ports[j];
+					break;
+				}
+			}
+			if (active_port != NULL && active_port->available != ACP_AVAILABLE_NO)
+				continue;
+
 			best = acp_device_find_best_port_index(d, NULL);
 			acp_device_set_port(d, best, 0);
 		}
diff --git a/spa/plugins/alsa/mixer/paths/analog-output-headphones.conf b/spa/plugins/alsa/mixer/paths/analog-output-headphones.conf
index 3c62c5e67..0e698bd9c 100644
--- a/spa/plugins/alsa/mixer/paths/analog-output-headphones.conf
+++ b/spa/plugins/alsa/mixer/paths/analog-output-headphones.conf
@@ -93,6 +93,12 @@ volume = merge
 override-map.1 = all
 override-map.2 = all-left,all-right
 
+; Keep Line Out disabled in the headphones path so selecting headphones
+; does not also drive speaker/line outputs on shared controls.
+[Element Line Out]
+switch = off
+volume = off
+
 ; This path is intended to control the first headphones, not
 ; the second headphones. But it should not hurt if we leave the second
 ; headphone jack enabled nonetheless.
diff --git a/spa/plugins/alsa/mixer/paths/analog-output-lineout.conf b/spa/plugins/alsa/mixer/paths/analog-output-lineout.conf
index 1ffce2225..a6fcfcb83 100644
--- a/spa/plugins/alsa/mixer/paths/analog-output-lineout.conf
+++ b/spa/plugins/alsa/mixer/paths/analog-output-lineout.conf
@@ -113,10 +113,23 @@ override-map.1 = all
 override-map.2 = all-left,all-right
 required-any = any
 
+[Element Line Out]
+switch = mute
+volume = merge
+override-map.1 = all
+override-map.2 = all-left,all-right
+
 [Element Master Mono]
 switch = off
 volume = off
 
+; Prefer manual routing decisions by disabling codec auto-mute here.
+[Element Auto-Mute Mode]
+enumeration = select
+
+[Option Auto-Mute Mode:Disabled]
+name = analog-output-lineout
+
 [Element Line HP Swap]
 switch = off
 required-any = any