diff --git a/profiles/audio/bap.c b/profiles/audio/bap.c
index 0489f66..0dc5b40 100644
--- a/profiles/audio/bap.c
+++ b/profiles/audio/bap.c
@@ -2708,17 +2708,6 @@ static bool match_device(const void *data, const void *match_data)
 	return bdata->device == device;
 }
 
-struct bt_bap *bap_get_session(struct btd_device *device)
-{
-	struct bap_data *data;
-
-	data = queue_find(sessions, match_device, device);
-	if (!data)
-		return NULL;
-
-	return data->bap;
-}
-
 static struct bap_data *bap_data_new(struct btd_device *device)
 {
 	struct bap_data *data;
diff --git a/profiles/audio/bap.h b/profiles/audio/bap.h
index 5220723..554670d 100644
--- a/profiles/audio/bap.h
+++ b/profiles/audio/bap.h
@@ -9,8 +9,6 @@
 
 extern struct bt_iso_qos bap_sink_pa_qos;
 
-struct bt_bap *bap_get_session(struct btd_device *device);
-
 void bap_iso_qos_to_bap_qos(struct bt_iso_qos *iso_qos,
 				struct bt_bap_qos *bap_qos);
 void bap_qos_to_iso_qos(struct bt_bap_qos *bap_qos,
diff --git a/profiles/audio/bass.c b/profiles/audio/bass.c
index 44320a7..6f68b80 100644
--- a/profiles/audio/bass.c
+++ b/profiles/audio/bass.c
@@ -1113,7 +1113,7 @@ static void bis_probe(uint8_t bis, uint8_t sgrp, struct iovec *caps,
 			/* Only client sessions must be handled */
 			continue;
 
-		bap = bap_get_session(data->device);
+		bap = bt_bap_get_session(bt_bass_get_att(data->bass), NULL);
 		if (!bap)
 			continue;