diff --git a/openbsc/src/libcommon/gsm_data_shared.c b/openbsc/src/libcommon/gsm_data_shared.c
index 529f72c..2488c3a 100644
--- a/openbsc/src/libcommon/gsm_data_shared.c
+++ b/openbsc/src/libcommon/gsm_data_shared.c
@@ -573,14 +573,13 @@
 	case GSM_PCHAN_CCCH_SDCCH4_CBCH:
 		/*
 		 * As a special hack for BCCH, lchan_nr == 4 may be passed
-		 * here. This should never be sent in an RSL message, so just
-		 * return 0. See osmo-bts-xxx/oml.c:opstart_compl().
+		 * here. This should never be sent in an RSL message.
+		 * See osmo-bts-xxx/oml.c:opstart_compl().
 		 */
-		if (lchan_nr == 4) {
+		if (lchan_nr == 4)
 			chan_nr = 0;
-			break;
-		}
-		OSMO_ASSERT(lchan_nr < 4);
+		else
+			OSMO_ASSERT(lchan_nr < 4);
 		cbits = 0x04;
 		cbits += lchan_nr;
 		break;