diff --git a/src/shared/bap.c b/src/shared/bap.c
index ca3a9e5..4bb6e08 100644
--- a/src/shared/bap.c
+++ b/src/shared/bap.c
@@ -1298,6 +1298,13 @@ static void bap_abort_stream_req(struct bt_bap *bap,
 						struct bt_bap_stream *stream)
 {
 	queue_remove_all(bap->reqs, match_req_stream, stream, bap_req_abort);
+
+	if (bap->req && bap->req->stream == stream) {
+		struct bt_bap_req *req = bap->req;
+
+		bap->req = NULL;
+		bap_req_complete(req, NULL);
+	}
 }
 
 static void bt_bap_stream_unref(void *data)