diff --git a/sound/soc/bcm/allo-piano-dac-plus.c b/sound/soc/bcm/allo-piano-dac-plus.c
index df167325a85eb8..f3f13b68535589 100644
--- a/sound/soc/bcm/allo-piano-dac-plus.c
+++ b/sound/soc/bcm/allo-piano-dac-plus.c
@@ -452,14 +452,6 @@ static int pcm512x_set_reg_sub(struct snd_kcontrol *kcontrol,
 
 	rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[0]);
 
-	if (digital_gain_0db_limit) {
-		ret = snd_soc_limit_volume(card, "Subwoofer Playback Volume",
-					207);
-		if (ret < 0)
-			dev_warn(card->dev, "Failed to set volume limit: %d\n",
-				ret);
-	}
-
 	// When in Dual Mono, Sub vol control should not set anything.
 	if (glb_ptr->dual_mode != 1) { //Not in Dual Mono mode
 
@@ -562,14 +554,6 @@ static int pcm512x_set_reg_master(struct snd_kcontrol *kcontrol,
 
 	rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[0]);
 
-	if (digital_gain_0db_limit) {
-		ret = snd_soc_limit_volume(card, "Master Playback Volume",
-					207);
-		if (ret < 0)
-			dev_warn(card->dev, "Failed to set volume limit: %d\n",
-				ret);
-	}
-
 	if (glb_ptr->dual_mode == 1) { //in Dual Mono Mode
 
 		ret = snd_soc_component_write(asoc_rtd_to_codec(rtd, 0)->component,
@@ -750,6 +734,18 @@ static int snd_allo_piano_dac_init(struct snd_soc_pcm_runtime *rtd)
 	if (digital_gain_0db_limit) {
 		int ret;
 
+		ret = snd_soc_limit_volume(card, "Master Playback Volume",
+					207);
+		if (ret < 0)
+			dev_warn(card->dev, "Failed to set master volume limit: %d\n",
+				ret);
+
+		ret = snd_soc_limit_volume(card, "Subwoofer Playback Volume",
+					207);
+		if (ret < 0)
+			dev_warn(card->dev, "Failed to set subwoofer volume limit: %d\n",
+				ret);
+
 		//Set volume limit on both dacs
 		for (i = 0; i < ARRAY_SIZE(codec_ctl_pfx); i++) {
 			char cname[256];
@@ -757,8 +753,8 @@ static int snd_allo_piano_dac_init(struct snd_soc_pcm_runtime *rtd)
 			sprintf(cname, "%s %s", codec_ctl_pfx[i], codec_ctl_name[0]);
 			ret = snd_soc_limit_volume(card, cname, 207);
 			if (ret < 0)
-				dev_warn(card->dev, "Failed to set volume limit: %d\n",
-					ret);
+				dev_warn(card->dev, "Failed to set %s volume limit: %d\n",
+					 cname, ret);
 		}
 	}