diff --git a/umac/scan/core/src/wlan_scan_cache_db.c b/umac/scan/core/src/wlan_scan_cache_db.c
index 5962df169e1d..1fb2eda388e2 100644
--- a/umac/scan/core/src/wlan_scan_cache_db.c
+++ b/umac/scan/core/src/wlan_scan_cache_db.c
@@ -62,6 +62,9 @@ struct meta_rnr_channel *scm_get_chan_meta(uint32_t chan_freq)
 {
 	int i;
 
+	if (!chan_freq || !wlan_reg_is_6ghz_chan_freq(chan_freq))
+		return NULL;
+
 	for (i = 0; i <= NUM_6GHZ_CHANNELS; i++)
 		if (rnr_channel_db.channel[i].chan_freq == chan_freq)
 			return &rnr_channel_db.channel[i];
@@ -84,7 +87,7 @@ static void scm_add_rnr_channel_db(struct scan_cache_entry *entry)
 	if (!(is_6g_bss || entry->ie_list.rnrie))
 		return;
 
-	scm_debug("scan entry channel freq %d", chan_freq);
+	scm_debug("BSS freq %d BSSID: %pM", chan_freq, entry->bssid.bytes);
 	if (is_6g_bss) {
 		channel = scm_get_chan_meta(chan_freq);
 		if (!channel) {
@@ -110,18 +113,17 @@ static void scm_add_rnr_channel_db(struct scan_cache_entry *entry)
 		chan_freq = wlan_reg_chan_opclass_to_freq(rnr_bss->channel_number,
 							  rnr_bss->operating_class,
 							  false);
-		/* continue if the BSS channel is not 6Ghz*/
-		if (!wlan_reg_is_6ghz_chan_freq(chan_freq))
-			continue;
 		channel = scm_get_chan_meta(chan_freq);
 		if (!channel) {
 			scm_debug("Failed to get chan Meta freq %d", chan_freq);
-			return;
+			continue;
 		}
 		channel->bss_beacon_probe_count++;
 		/* Don't add RNR entry if list is full */
-		if (qdf_list_size(&channel->rnr_list) >= WLAN_MAX_RNR_COUNT)
-			continue;
+		if (qdf_list_size(&channel->rnr_list) >= WLAN_MAX_RNR_COUNT) {
+			scm_debug("List is full");
+			return;
+		}
 
 		rnr_node = qdf_mem_malloc(sizeof(struct scan_rnr_node));
 		if (!rnr_node)
@@ -133,6 +135,8 @@ static void scm_add_rnr_channel_db(struct scan_cache_entry *entry)
 				     QDF_MAC_ADDR_SIZE);
 		if (rnr_bss->short_ssid)
 			rnr_node->entry.short_ssid = rnr_bss->short_ssid;
+		scm_debug("Add freq %d: %pM short ssid %x", chan_freq,
+			  rnr_bss->bssid.bytes, rnr_bss->short_ssid);
 		qdf_list_insert_back(&channel->rnr_list,
 				     &rnr_node->node);
 	}
@@ -154,7 +158,7 @@ static void scm_del_rnr_channel_db(struct scan_cache_entry *entry)
 	if (!(is_6g_bss || entry->ie_list.rnrie))
 		return;
 
-	scm_debug("channel freq of scan entry %d", chan_freq);
+	scm_debug("BSS freq %d BSSID: %pM", chan_freq, entry->bssid.bytes);
 	if (is_6g_bss) {
 		channel = scm_get_chan_meta(chan_freq);
 		if (!channel) {
@@ -182,7 +186,7 @@ static void scm_del_rnr_channel_db(struct scan_cache_entry *entry)
 		if (!channel) {
 			scm_debug("Failed to get chan Meta freq %d",
 				  chan_freq);
-			return;
+			continue;
 		}
 		cur_node = NULL;
 		qdf_list_peek_front(&channel->rnr_list, &cur_node);
@@ -1637,13 +1641,14 @@ QDF_STATUS scm_channel_list_db_init(struct wlan_objmgr_psoc *psoc)
 
 	scm_info("min_freq %d max_freq %d", min_freq, max_freq);
 	i = min_freq;
+	qdf_mem_zero(&rnr_channel_db, sizeof(struct channel_list_db));
 	for (j = 0; j < NUM_6GHZ_CHANNELS; j++) {
-		if (i >= min_freq && i <= max_freq) {
+		if (i >= min_freq && i <= max_freq)
 			rnr_channel_db.channel[j].chan_freq = i;
-			qdf_list_create(&rnr_channel_db.channel[j].rnr_list,
-					WLAN_MAX_RNR_COUNT);
-		}
 		i += 20;
+		/* init list for all to avoid uninitialized list */
+		qdf_list_create(&rnr_channel_db.channel[j].rnr_list,
+				WLAN_MAX_RNR_COUNT);
 	}
 	return QDF_STATUS_SUCCESS;
 }
@@ -1658,6 +1663,9 @@ QDF_STATUS scm_channel_list_db_deinit(struct wlan_objmgr_psoc *psoc)
 	for (i = 0; i < NUM_6GHZ_CHANNELS; i++) {
 		channel = &rnr_channel_db.channel[i];
 		channel->chan_freq = 0;
+		channel->beacon_probe_last_time_found = 0;
+		channel->bss_beacon_probe_count = 0;
+		channel->saved_profile_count = 0;
 		cur_node = NULL;
 		qdf_list_peek_front(&channel->rnr_list, &cur_node);
 		while (cur_node) {
@@ -1673,6 +1681,7 @@ QDF_STATUS scm_channel_list_db_deinit(struct wlan_objmgr_psoc *psoc)
 			cur_node = next_node;
 			next_node = NULL;
 		}
+		qdf_list_destroy(&channel->rnr_list);
 	}
 
 	return QDF_STATUS_SUCCESS;
diff --git a/umac/scan/core/src/wlan_scan_manager.c b/umac/scan/core/src/wlan_scan_manager.c
index 4f14bdb99d0e..3dfc1c3972a0 100644
--- a/umac/scan/core/src/wlan_scan_manager.c
+++ b/umac/scan/core/src/wlan_scan_manager.c
@@ -960,12 +960,17 @@ static void scm_sort_6ghz_channel_list(struct wlan_objmgr_vdev *vdev,
 	}
 
 	/* compute the weightage */
-	for (i = 0; i < tmp_list_count; i++) {
+	for (i = 0, j = 0; i < tmp_list_count; i++) {
 		channel = scm_get_chan_meta(temp_list[i].freq);
+		if (!channel)
+			continue;
 		weight = channel->bss_beacon_probe_count * BCN_PROBE_WEIGHTAGE +
 			 channel->saved_profile_count * SAVED_PROFILE_WEIGHTAGE;
-		rnr_chan_info[i].weight = weight;
-		rnr_chan_info[i].chan_freq = temp_list[i].freq;
+		rnr_chan_info[j].weight = weight;
+		rnr_chan_info[j].chan_freq = temp_list[i].freq;
+		j++;
+		scm_debug("Freq %d weight %d bcn_cnt %d", temp_list[i].freq,
+			  weight, channel->bss_beacon_probe_count);
 	}
 
 	/* Sort the channel using selection sort */
@@ -988,10 +993,9 @@ static void scm_sort_6ghz_channel_list(struct wlan_objmgr_vdev *vdev,
 	}
 
 	/* update the 6g list based on the weightage */
-	for (i = 0, j = 0;
-		(i < NUM_CHANNELS && j < NUM_6GHZ_CHANNELS); i++) {
+	for (i = 0, j = tmp_list_count - 1; (i < NUM_CHANNELS && j > 0); i++) {
 		if (wlan_reg_is_6ghz_chan_freq(chan_list->chan[i].freq))
-			chan_list->chan[i].freq = rnr_chan_info[j++].chan_freq;
+			chan_list->chan[i].freq = rnr_chan_info[j--].chan_freq;
 	}
 	qdf_mem_free(rnr_chan_info);
 }
@@ -1013,8 +1017,6 @@ static void scm_update_rnr_info(struct scan_start_request *req)
 	chan_list = &req->scan_req.chan_list;
 	for (i = 0; i < chan_list->num_chan; i++) {
 		freq = chan_list->chan[i].freq;
-		if (!wlan_reg_is_6ghz_chan_freq(freq))
-			continue;
 
 		chan = scm_get_chan_meta(freq);
 		if (!chan) {
@@ -1029,13 +1031,17 @@ static void scm_update_rnr_info(struct scan_start_request *req)
 			rnr_node = qdf_container_of(cur_node,
 						    struct scan_rnr_node,
 						    node);
-			if (!qdf_is_macaddr_zero(&rnr_node->entry.bssid)) {
+			if (!qdf_is_macaddr_zero(&rnr_node->entry.bssid) &&
+			    req->scan_req.num_hint_bssid <
+			    WLAN_SCAN_MAX_HINT_BSSID) {
 				qdf_mem_copy(&req->scan_req.hint_bssid[num_bssid++].bssid,
 					     &rnr_node->entry.bssid,
 					     QDF_MAC_ADDR_SIZE);
 				req->scan_req.num_hint_bssid++;
 				total_count--;
-			} else if (rnr_node->entry.short_ssid) {
+			} else if (rnr_node->entry.short_ssid &&
+				   req->scan_req.num_hint_s_ssid <
+				   WLAN_SCAN_MAX_HINT_S_SSID) {
 				req->scan_req.hint_s_ssid[num_ssid++].short_ssid =
 						rnr_node->entry.short_ssid;
 				req->scan_req.num_hint_s_ssid++;