diff --git a/openbsc/src/gprs/gprs_llc.c b/openbsc/src/gprs/gprs_llc.c
index 9b5bf4b..2d5d9be 100644
--- a/openbsc/src/gprs/gprs_llc.c
+++ b/openbsc/src/gprs/gprs_llc.c
@@ -679,7 +679,7 @@
 		return rc;
 
 	/* llhp.data is only set when we need to send LL_[UNIT]DATA_IND up */
-	if (llhp.data) {
+	if (llhp.data && llhp.data_len) {
 		msgb_gmmh(msg) = llhp.data;
 		switch (llhp.sapi) {
 		case GPRS_SAPI_GMM: