diff --git a/dp/wifi3.0/dp_main.c b/dp/wifi3.0/dp_main.c
index c40bd05540..b8dff26096 100644
--- a/dp/wifi3.0/dp_main.c
+++ b/dp/wifi3.0/dp_main.c
@@ -9874,9 +9874,11 @@ void dp_get_peer_extd_stats(struct dp_peer *peer,
 	struct dp_txrx_peer *txrx_peer;
 	struct dp_peer_extd_stats *extd_stats;
 
-	txrx_peer = peer->txrx_peer;
-	if (!txrx_peer)
+	txrx_peer = dp_get_txrx_peer(peer);
+	if (qdf_unlikely(!txrx_peer)) {
+		dp_err_rl("txrx_peer NULL");
 		return;
+	}
 
 	extd_stats = &txrx_peer->stats.extd_stats;
 	DP_UPDATE_EXTD_STATS(peer_stats, extd_stats);
diff --git a/dp/wifi3.0/dp_rx.c b/dp/wifi3.0/dp_rx.c
index 1b81450a4c..0bc94166d7 100644
--- a/dp/wifi3.0/dp_rx.c
+++ b/dp/wifi3.0/dp_rx.c
@@ -2291,7 +2291,7 @@ dp_rx_rates_stats_update(struct dp_soc *soc, qdf_nbuf_t nbuf,
 	DP_PEER_EXTD_STATS_UPD(txrx_peer, rx.rx_rate, mcs);
 
 	/* In 11b mode, the nss we get from tlv is 0, invalid and should be 1 */
-	if (pkt_type == DOT11_B)
+	if (qdf_unlikely(pkt_type == DOT11_B))
 		nss = 1;
 
 	/* here pkt_type corresponds to preamble */