diff --git a/src/gsm/lapd_core.c b/src/gsm/lapd_core.c
index 68b5e78..3288ee8 100644
--- a/src/gsm/lapd_core.c
+++ b/src/gsm/lapd_core.c
@@ -1962,11 +1962,14 @@
 	if (dl->send_buffer)
 		msgb_free(dl->send_buffer);
 	dl->send_out = 0;
-	if (msg && msg->len)
+	if (msg->len) {
 		/* Write data into the send buffer, to be sent first */
 		dl->send_buffer = msg;
-	else
+	} else {
+		msgb_free(msg);
+		msg = NULL;
 		dl->send_buffer = NULL;
+	}
 
 	/* Discard partly received L3 message */
 	if (dl->rcv_buffer) {