diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c
index 29ae3eafd0f0..7b834b8b2b22 100644
--- a/core/wma/src/wma_dev_if.c
+++ b/core/wma/src/wma_dev_if.c
@@ -3676,6 +3676,14 @@ void wma_vdev_resp_timer(void *data)
 			wma_trigger_recovery_assert_on_fw_timeout(
 				WMA_ADD_BSS_REQ);
 		} else {
+			peer = cdp_peer_find_by_addr(soc, pdev, params->bssId,
+						     &peer_id);
+			if (peer)
+				wma_remove_peer(wma, params->bssId,
+						tgt_req->vdev_id, peer, false);
+			else
+				WMA_LOGE("%s: Failed to find peer", __func__);
+
 			wma_send_msg_high_priority(wma, WMA_ADD_BSS_RSP,
 						   (void *)params, 0);
 			QDF_ASSERT(0);