diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c
index 7c90d67d03e2..ac0d2ead2997 100644
--- a/core/wma/src/wma_dev_if.c
+++ b/core/wma/src/wma_dev_if.c
@@ -740,9 +740,11 @@ void wma_vdev_wait_for_peer_delete_completion(tp_wma_handle wma_handle,
 	 * P2P device, and no need to take care the case which no
 	 * vdev stop response from FW.
 	 */
-	if ((iface->type == WMI_VDEV_TYPE_AP) &&
-	    (iface->sub_type == WMI_UNIFIED_VDEV_SUBTYPE_P2P_DEVICE)) {
-		WMA_LOGD("%s: P2P devices, do not wait", __func__);
+	if (((iface->type == WMI_VDEV_TYPE_AP) &&
+	    (iface->sub_type == WMI_UNIFIED_VDEV_SUBTYPE_P2P_DEVICE)) ||
+	    (cds_is_fw_down())) {
+		WMA_LOGD("%s: type %d P2P devices  or firmware is down, do not wait",
+				__func__, iface->type);
 		return;
 	}