diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h
index 438864464054..df6398268350 100644
--- a/core/wma/inc/wma.h
+++ b/core/wma/inc/wma.h
@@ -907,7 +907,6 @@ struct wma_txrx_node {
 	uint8_t wep_default_key_idx;
 	tSirHostOffloadReq arp_offload_req;
 	tSirHostOffloadReq ns_offload_req;
-	bool is_vdev_valid;
 #ifndef QCA_SUPPORT_CP_STATS
 	struct sir_vdev_wow_stats wow_stats;
 #endif
diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c
index 7494bfaa3085..d28140c4ad82 100644
--- a/core/wma/src/wma_dev_if.c
+++ b/core/wma/src/wma_dev_if.c
@@ -568,7 +568,6 @@ wma_cdp_vdev_detach(ol_txrx_soc_handle soc,
 	cdp_vdev_detach(soc,
 		iface->handle, NULL, NULL);
 	iface->handle = NULL;
-	iface->is_vdev_valid = false;
 }
 
 static QDF_STATUS wma_handle_vdev_detach(tp_wma_handle wma_handle,
@@ -850,7 +849,6 @@ QDF_STATUS wma_vdev_detach(tp_wma_handle wma_handle,
 
 	if (QDF_IS_STATUS_SUCCESS(status))
 		iface->vdev_active = false;
-
 	return status;
 
 send_fail_rsp:
@@ -1283,12 +1281,10 @@ bool wma_is_vdev_valid(uint32_t vdev_id)
 		return false;
 	}
 
-	WMA_LOGD("%s: vdev_id: %d, vdev_active: %d, is_vdev_valid %d",
-		 __func__, vdev_id, wma_handle->interfaces[vdev_id].vdev_active,
-		 wma_handle->interfaces[vdev_id].is_vdev_valid);
+	WMA_LOGD("%s: vdev_id: %d, vdev_active: %d", __func__, vdev_id,
+		 wma_handle->interfaces[vdev_id].vdev_active);
 
-	return wma_handle->interfaces[vdev_id].vdev_active ||
-		wma_handle->interfaces[vdev_id].is_vdev_valid;
+	return wma_handle->interfaces[vdev_id].vdev_active;
 }
 
 /**
@@ -2409,7 +2405,6 @@ struct cdp_vdev *wma_vdev_attach(tp_wma_handle wma_handle,
 	if (ret)
 		WMA_LOGE("Failed to set WMI_VDEV_PARAM_DISCONNECT_TH");
 
-	wma_handle->interfaces[vdev_id].is_vdev_valid = true;
 	ret = wma_vdev_set_param(wma_handle->wmi_handle,
 				self_sta_req->session_id,
 				WMI_VDEV_PARAM_MCC_RTSCTS_PROTECTION_ENABLE,
@@ -5576,7 +5571,7 @@ static void wma_wait_tx_complete(tp_wma_handle wma,
 	uint8_t max_wait_iterations = 0;
 	void *soc = cds_get_context(QDF_MODULE_ID_SOC);
 
-	if (!wma->interfaces[session_id].is_vdev_valid) {
+	if (!wma_is_vdev_valid(session_id)) {
 		WMA_LOGE("%s: Vdev is not valid: %d",
 			 __func__, session_id);
 		return;
diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c
index 24bf2e571a42..ec138f594174 100644
--- a/core/wma/src/wma_features.c
+++ b/core/wma/src/wma_features.c
@@ -1177,7 +1177,7 @@ void wma_check_and_set_wake_timer(uint32_t time)
 
 	for (i = 0; i < wma->max_bssid; i++) {
 		iface = &wma->interfaces[i];
-		if (iface->is_vdev_valid && iface->is_waiting_for_key) {
+		if (iface->vdev_active && iface->is_waiting_for_key) {
 			/*
 			 * right now cookie is dont care, since FW disregards
 			 * that.
@@ -4379,7 +4379,7 @@ QDF_STATUS wma_process_set_ie_info(tp_wma_handle wma,
 	}
 
 	interface = &wma->interfaces[ie_info->vdev_id];
-	if (!interface->is_vdev_valid) {
+	if (!wma_is_vdev_valid(ie_info->vdev_id)) {
 		WMA_LOGE(FL("vdev_id: %d is not active"), ie_info->vdev_id);
 		return QDF_STATUS_E_INVAL;
 	}
diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c
index e052386ba84a..3382dc3b3f34 100644
--- a/core/wma/src/wma_main.c
+++ b/core/wma/src/wma_main.c
@@ -995,7 +995,7 @@ static void wma_process_cli_set_cmd(tp_wma_handle wma,
 
 	switch (privcmd->param_vp_dev) {
 	case VDEV_CMD:
-		if (!wma->interfaces[privcmd->param_vdev_id].is_vdev_valid) {
+		if (!wma_is_vdev_valid(privcmd->param_vdev_id)) {
 			WMA_LOGE("%s Vdev id is not valid", __func__);
 			return;
 		}