diff --git a/components/cp_stats/dispatcher/src/wlan_cp_stats_mc_tgt_api.c b/components/cp_stats/dispatcher/src/wlan_cp_stats_mc_tgt_api.c
index 046abc275522..82c09bcf842f 100644
--- a/components/cp_stats/dispatcher/src/wlan_cp_stats_mc_tgt_api.c
+++ b/components/cp_stats/dispatcher/src/wlan_cp_stats_mc_tgt_api.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -299,8 +300,7 @@ tgt_mc_cp_stats_prepare_raw_peer_rssi(struct wlan_objmgr_psoc *psoc,
 	}
 
 end:
-	if (ev.peer_stats)
-		get_peer_rssi_cb(&ev, last_req->cookie);
+	get_peer_rssi_cb(&ev, last_req->cookie);
 
 	ucfg_mc_cp_stats_free_stats_resources(&ev);
 
diff --git a/os_if/cp_stats/src/wlan_cfg80211_mc_cp_stats.c b/os_if/cp_stats/src/wlan_cfg80211_mc_cp_stats.c
index 2c995419f292..ef11038c3b71 100644
--- a/os_if/cp_stats/src/wlan_cfg80211_mc_cp_stats.c
+++ b/os_if/cp_stats/src/wlan_cfg80211_mc_cp_stats.c
@@ -403,6 +403,11 @@ static void get_peer_rssi_cb(struct stats_event *ev, void *cookie)
 		return;
 	}
 
+	if (!ev->peer_stats) {
+		osif_err("no peer stats");
+		goto get_peer_rssi_cb_fail;
+	}
+
 	priv = osif_request_priv(request);
 	rssi_size = sizeof(*ev->peer_stats) * ev->num_peer_stats;
 	if (rssi_size == 0) {