diff --git a/src/common/lchan.c b/src/common/lchan.c
index a3be4ee0d..e53261531 100644
--- a/src/common/lchan.c
+++ b/src/common/lchan.c
@@ -364,14 +364,7 @@ static uint8_t gsm_pchan2chan_nr(enum gsm_phys_chan_config pchan,
 	default:
 		LOGP(DRSL, LOGL_ERROR, "Physical channel %s (0x%02x) not expected!\n",
 		     gsm_pchan_name(pchan), (int)pchan);
-		/* OSMO_ASSERT(lchan_nr == 0);
-		 * FIXME: On octphy and litecell, we hit above assertion (see
-		 * Max's comment at https://gerrit.osmocom.org/589 ); disabled
-		 * for BTS until this is clarified; remove the #ifdef when it
-		 * is fixed. Tracked in OS#2906.
-		 */
-#pragma message "fix caller that passes lchan_nr != 0"
-		cbits = 0x10;
+		OSMO_ASSERT(0);
 		break;
 	}