diff --git a/asoc/codecs/wsa884x/wsa884x.c b/asoc/codecs/wsa884x/wsa884x.c
index 7cea810fa8..d2bdf12554 100644
--- a/asoc/codecs/wsa884x/wsa884x.c
+++ b/asoc/codecs/wsa884x/wsa884x.c
@@ -1847,14 +1847,10 @@ static int wsa884x_event_notify(struct notifier_block *nb,
 		return -EINVAL;
 
 	switch (event) {
-	case BOLERO_SLV_EVT_PA_OFF_PRE_SSR:
-		if (test_bit(SPKR_STATUS, &wsa884x->status_mask))
-			snd_soc_component_update_bits(wsa884x->component,
-				REG_FIELD_VALUE(PA_FSM_EN, GLOBAL_PA_EN, 0x00));
-		wsa884x_swr_down(wsa884x);
-		break;
-
 	case BOLERO_SLV_EVT_SSR_UP:
+		wsa884x_swr_down(wsa884x);
+		usleep_range(500, 510);
+
 		wsa884x_swr_up(wsa884x);
 		/* Add delay to allow enumerate */
 		usleep_range(20000, 20010);