diff --git a/core/wma/src/wma_data.c b/core/wma/src/wma_data.c
index 31a8b1e15b..0cb2cf23a2 100644
--- a/core/wma/src/wma_data.c
+++ b/core/wma/src/wma_data.c
@@ -3168,6 +3168,9 @@ bool wma_is_roam_in_progress(uint32_t vdev_id)
 	tp_wma_handle wma = cds_get_context(QDF_MODULE_ID_WMA);
 	enum QDF_OPMODE opmode;
 
+	if (!wma_is_vdev_valid(vdev_id))
+		return false;
+
 	if (!wma || !wma->interfaces[vdev_id].vdev)
 		return false;
 
diff --git a/core/wma/src/wma_mgmt.c b/core/wma/src/wma_mgmt.c
index 60a1b8d3a1..0a61f29aac 100644
--- a/core/wma/src/wma_mgmt.c
+++ b/core/wma/src/wma_mgmt.c
@@ -344,6 +344,10 @@ int wma_peer_sta_kickout_event_handler(void *handle, uint8_t *event,
 			 QDF_MAC_ADDR_REF(macaddr));
 		return -EINVAL;
 	}
+
+	if (!wma_is_vdev_valid(vdev_id))
+		return -EINVAL;
+
 	vdev = wma->interfaces[vdev_id].vdev;
 	if (!vdev) {
 		wma_err("Not able to find vdev for VDEV_%d", vdev_id);