diff --git a/components/target_if/connection_mgr/src/target_if_cm_roam_event.c b/components/target_if/connection_mgr/src/target_if_cm_roam_event.c
index c4b5704d36..c01e49e6da 100644
--- a/components/target_if/connection_mgr/src/target_if_cm_roam_event.c
+++ b/components/target_if/connection_mgr/src/target_if_cm_roam_event.c
@@ -259,6 +259,12 @@ target_if_cm_btm_blacklist_event(ol_scn_t scn, uint8_t *event, uint32_t len)
 		return -EINVAL;
 	}
 
+	if (!dst_list) {
+		/* No APs to blacklist, just return */
+		target_if_err_rl("No APs in blacklist received");
+		return 0;
+	}
+
 	roam_rx_ops = target_if_cm_get_roam_rx_ops(psoc);
 	if (!roam_rx_ops || !roam_rx_ops->btm_blacklist_event) {
 		target_if_err("No valid roam rx ops");
diff --git a/components/wmi/src/wmi_unified_roam_tlv.c b/components/wmi/src/wmi_unified_roam_tlv.c
index c94759c5f1..f64f37865b 100644
--- a/components/wmi/src/wmi_unified_roam_tlv.c
+++ b/components/wmi/src/wmi_unified_roam_tlv.c
@@ -2711,11 +2711,8 @@ extract_btm_blacklist_event(wmi_unified_t wmi_handle,
 	}
 
 	num_entries = param_buf->num_blacklist_with_timeout;
-	if (num_entries == 0) {
-		/* no aps to blacklist just return*/
-		wmi_err("No APs in blacklist received");
+	if (num_entries == 0)
 		return QDF_STATUS_SUCCESS;
-	}
 
 	if (num_entries > MAX_RSSI_AVOID_BSSID_LIST) {
 		wmi_err("num blacklist entries:%d exceeds maximum value",