diff --git a/configs/default_defconfig b/configs/default_defconfig
index 00a47f3e7a..5f1d009135 100644
--- a/configs/default_defconfig
+++ b/configs/default_defconfig
@@ -1446,9 +1446,7 @@ ifeq ($(CONFIG_ARCH_MDM9607), y)
 CONFIG_TUFELLO_DUAL_FW_SUPPORT := y
 endif
 
-ifeq ($(CONFIG_ARCH_MSM8996), y)
 CONFIG_CHANNEL_HOPPING_ALL_BANDS := y
-endif
 
 ifeq (y, $(filter y, $(CONFIG_ARCH_SDXPRAIRIE) $(CONFIG_ARCH_SA515)))
 	ifneq ($(CONFIG_SLUB_DEBUG), y)
diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c
index 0ab4a832cc..4250b0c24b 100644
--- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c
+++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c
@@ -10040,6 +10040,7 @@ skip_vht:
 
 	/* Send ECSA/CSA Action frame after updating the beacon */
 	if (CHAN_HOP_ALL_BANDS_ENABLE &&
+	    session_entry->lim_non_ecsa_cap_num &&
 	    !WLAN_REG_IS_6GHZ_CHAN_FREQ(target_ch_freq))
 		lim_send_chan_switch_action_frame
 			(mac_ctx,
diff --git a/core/mac/src/pe/sch/sch_beacon_gen.c b/core/mac/src/pe/sch/sch_beacon_gen.c
index 6bcd546cd6..43d20d8bf5 100644
--- a/core/mac/src/pe/sch/sch_beacon_gen.c
+++ b/core/mac/src/pe/sch/sch_beacon_gen.c
@@ -701,7 +701,6 @@ sch_set_fixed_beacon_fields(struct mac_context *mac_ctx, struct pe_session *sess
 		}
 
 		if (session->lim_non_ecsa_cap_num &&
-		    WLAN_REG_IS_24GHZ_CH_FREQ(session->curr_op_freq) &&
 		    !is_6ghz_chsw)
 			populate_channel_switch_ann(mac_ctx, bcn_2, session);
 	}