diff --git a/openbsc/src/bsc_init.c b/openbsc/src/bsc_init.c
index d89ab94..1394dd8 100644
--- a/openbsc/src/bsc_init.c
+++ b/openbsc/src/bsc_init.c
@@ -378,10 +378,10 @@
 		trx = ts->trx;
 		if (new_state->operational == 1 &&
 		    new_state->availability == NM_AVSTATE_DEPENDENCY) {
-			if (ts->nr == 0 && trx == trx->bts->c0)
-				abis_nm_set_channel_attr(ts, NM_CHANC_BCCHComb);
-			else
-				abis_nm_set_channel_attr(ts, NM_CHANC_TCHFull);
+			patch_nm_tables(bts);
+			enum abis_nm_chan_comb ccomb =
+						abis_nm_chcomb4pchan(ts->pchan);
+			abis_nm_set_channel_attr(ts, ccomb);
 			abis_nm_chg_adm_state(trx->bts, obj_class,
 					      trx->bts->bts_nr, trx->nr, ts->nr,
 					      NM_STATE_UNLOCKED);