diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c
index 35f93338f1f1..dc26ac821b75 100644
--- a/core/hdd/src/wlan_hdd_cfg80211.c
+++ b/core/hdd/src/wlan_hdd_cfg80211.c
@@ -412,10 +412,16 @@ static void hdd_init_6ghz(struct hdd_context *hdd_ctx)
 	struct wiphy *wiphy = hdd_ctx->wiphy;
 	struct ieee80211_channel *chlist = hdd_channels_6_ghz;
 	uint32_t num = ARRAY_SIZE(hdd_channels_6_ghz);
+	uint16_t base_freq;
 
 	qdf_mem_zero(chlist, sizeof(*chlist) * num);
+	base_freq = wlan_reg_min_6ghz_chan_freq();
+
 	for (i = 0; i < num; i++)
-		HDD_SET_6GHZCHAN(chlist[i], 5945 + i * 20, 1 + i * 4, \
+		HDD_SET_6GHZCHAN(chlist[i],
+				 base_freq + i * 20,
+				 wlan_reg_freq_to_chan(hdd_ctx->pdev,
+						       base_freq + i * 20),
 				 IEEE80211_CHAN_DISABLED);
 	wiphy->bands[HDD_NL80211_BAND_6GHZ] = &wlan_hdd_band_6_ghz;
 	wiphy->bands[HDD_NL80211_BAND_6GHZ]->channels = chlist;
diff --git a/core/hdd/src/wlan_hdd_object_manager.c b/core/hdd/src/wlan_hdd_object_manager.c
index a2c7b7490684..de20dc7ddcda 100644
--- a/core/hdd/src/wlan_hdd_object_manager.c
+++ b/core/hdd/src/wlan_hdd_object_manager.c
@@ -34,10 +34,10 @@
 #ifdef CONFIG_BAND_6GHZ
 #define HIGH_5GHZ_FREQ 7200
 #else
-#define HIGH_5GHZ_FREQ 5930
+#define HIGH_5GHZ_FREQ 5920
 #endif
 
-#define HIGH_5GHZ_FREQ_NO_6GHZ 5930
+#define HIGH_5GHZ_FREQ_NO_6GHZ 5920
 
 static void hdd_init_pdev_os_priv(struct hdd_context *hdd_ctx,
 	struct pdev_osif_priv *os_priv)