diff --git a/openbsc/src/bsc_api.c b/openbsc/src/bsc_api.c
index 02fc473..cac08be 100644
--- a/openbsc/src/bsc_api.c
+++ b/openbsc/src/bsc_api.c
@@ -47,6 +47,7 @@
 	msg->lchan = conn->lchan;
 	msg->trx = msg->lchan->ts->trx;
 
+	msg->l3h = msg->data;
 	if (conn->lchan->sapis[sapi] == LCHAN_SAPI_UNUSED) {
 		OBSC_LINKID_CB(msg) = link_id;
 		if (rll_establish(msg->lchan, sapi, rll_ind_cb, msg) != 0) {
diff --git a/openbsc/src/gsm_04_08.c b/openbsc/src/gsm_04_08.c
index f87406a..e76a63a 100644
--- a/openbsc/src/gsm_04_08.c
+++ b/openbsc/src/gsm_04_08.c
@@ -99,7 +99,6 @@
 				gh->proto_discr, gh->msg_type);
 	}
 
-	msg->l3h = msg->data;
 	return gsm0808_submit_dtap(conn, msg, 0);
 }