diff --git a/ucm2/HDA/HiFi-analog.conf b/ucm2/HDA/HiFi-analog.conf
index 3c96f5d7..1136411f 100644
--- a/ucm2/HDA/HiFi-analog.conf
+++ b/ucm2/HDA/HiFi-analog.conf
@@ -146,12 +146,19 @@ If.spk {
 				EnableSequence [
 					cset "name='Speaker Playback Switch' on"
 					cset "name='Bass Speaker Playback Switch' on"
+					cset "name='Speaker Playback Volume' 100%"
+					cset "name='Bass Speaker Playback Volume' 100%"
 				]
 
 				DisableSequence [
 					cset "name='Speaker Playback Switch' off"
 					cset "name='Bass Speaker Playback Switch' off"
 				]
+				Value {
+					PlaybackMixerElem "Master"
+					PlaybackVolume "Master Playback Volume"
+					PlaybackSwitch "Master Playback Switch"
+				}
 			}
 			False {
 				EnableSequence [
@@ -161,16 +168,18 @@ If.spk {
 				DisableSequence [
 					cset "name='Speaker Playback Switch' off"
 				]
+				Value {
+					PlaybackMixerElem "Speaker"
+					PlaybackVolume "Speaker Playback Volume"
+					PlaybackSwitch "Speaker Playback Switch"
+				}
 			}
 		}
 
 		Value {
 			PlaybackPriority 100
 			PlaybackPCM "hw:${CardId}"
-			PlaybackMixerElem "Speaker"
 			PlaybackMasterElem "Master"
-			PlaybackVolume "Speaker Playback Volume"
-			PlaybackSwitch "Speaker Playback Switch"
 		}
 	}
 }