diff --git a/hal/wifi3.0/qca6390/hal_6390_rx.h b/hal/wifi3.0/qca6390/hal_6390_rx.h
index 2ace8eb6d9..90721f1651 100644
--- a/hal/wifi3.0/qca6390/hal_6390_rx.h
+++ b/hal/wifi3.0/qca6390/hal_6390_rx.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2019 The Linux Foundation. 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
@@ -55,10 +55,16 @@ hal_rx_msdu_start_nss_get_6390(uint8_t *buf)
 	struct rx_msdu_start *msdu_start =
 				&pkt_tlvs->msdu_start_tlv.rx_msdu_start;
 	uint8_t mimo_ss_bitmap;
+	uint32_t ss_index;
 
 	mimo_ss_bitmap = HAL_RX_MSDU_START_MIMO_SS_BITMAP(msdu_start);
+	ss_index = qdf_get_hweight8(mimo_ss_bitmap);
 
-	return qdf_get_hweight8(mimo_ss_bitmap);
+	/* Hot fix only, maxinum nss number for MCL set to 1 (nss 2)*/
+	if ((ss_index > 1) && (ss_index <= 3))
+		ss_index = 1;
+
+	return ss_index;
 }
 
 /**