diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c
index 2115a6b57c..729d273269 100644
--- a/core/wma/src/wma_main.c
+++ b/core/wma/src/wma_main.c
@@ -3831,6 +3831,12 @@ static int wma_pdev_set_hw_mode_resp_evt_handler(void *handle,
 			QDF_BUG(0);
 			goto fail;
 		}
+		if (vdev_id >= wma->max_bssid) {
+			WMA_LOGE("%s: vdev_id: %d is invalid, max_bssid: %d",
+				 __func__, vdev_id, wma->max_bssid);
+			goto fail;
+		}
+
 		mac_id = WMA_PDEV_TO_MAC_MAP(vdev_mac_entry[i].pdev_id);
 
 		WMA_LOGD("%s: vdev_id:%d mac_id:%d",
@@ -3921,6 +3927,11 @@ void wma_process_pdev_hw_mode_trans_ind(void *handle,
 			QDF_BUG(0);
 			return;
 		}
+		if (vdev_id >= wma->max_bssid) {
+			WMA_LOGE("%s: vdev_id: %d is invalid, max_bssid: %d",
+				 __func__, vdev_id, wma->max_bssid);
+			return;
+		}
 
 		mac_id = WMA_PDEV_TO_MAC_MAP(vdev_mac_entry[i].pdev_id);