diff --git a/src/hnbap_common.c b/src/hnbap_common.c
index 42a4b06..d13cb50 100644
--- a/src/hnbap_common.c
+++ b/src/hnbap_common.c
@@ -70,7 +70,7 @@
 	}
 
 	rval = aper_encode_to_buffer(&asn_DEF_HNBAP_PDU, &pdu,
-				     msg->data, msgb_length(msg));
+				     msg->data, msgb_tailroom(msg));
 	if (rval.encoded < 0) {
 		LOGP(DMAIN, LOGL_ERROR, "Error encoding type %s\n", rval.failed_type->name);
 		msgb_free(msg);