diff --git a/src/libmsc/msc_a.c b/src/libmsc/msc_a.c
index 943e7524e..01b230752 100644
--- a/src/libmsc/msc_a.c
+++ b/src/libmsc/msc_a.c
@@ -47,6 +47,7 @@
 #include <osmocom/msc/rtp_stream.h>
 #include <osmocom/msc/msc_ho.h>
 #include <osmocom/msc/codec_sdp_cc_t9n.h>
+#include <osmocom/msc/codec_filter.h>
 
 #define MSC_A_USE_WAIT_CLEAR_COMPLETE "wait-Clear-Complete"
 
@@ -1341,6 +1342,10 @@ static void msc_a_up_call_assignment_complete(struct msc_a *msc_a, const struct
 
 	rtp_stream_commit(rtps_to_ran);
 
+	/* Remember the Codec List (BSS Supported) */
+	if (ac->assignment_complete.codec_list_bss_supported)
+		codec_filter_set_bss(&cc_trans->cc.codecs, ac->assignment_complete.codec_list_bss_supported);
+
 	/* Setup CN side endpoint CI:
 	 * Now that
 	 * - the first CI has been created and a definitive endpoint name is assigned to the call_leg's MGW