diff --git a/src/llc.cpp b/src/llc.cpp
index e5d5646..b756d33 100644
--- a/src/llc.cpp
+++ b/src/llc.cpp
@@ -42,6 +42,7 @@
 
 void gprs_llc::enqueue(struct msgb *llc_msg)
 {
+	m_queue_size += 1;
 	msgb_enqueue(&queue, llc_msg);
 }
 
@@ -67,16 +68,21 @@
 		bts->llc_dropped_frame();
 		msgb_free(msg);
 	}
+
+	m_queue_size = 0;
 }
 
 void gprs_llc::init()
 {
 	INIT_LLIST_HEAD(&queue);
+	m_queue_size = 0;
 	reset();
 }
 
 struct msgb *gprs_llc::dequeue()
 {
+	if (m_queue_size > 0)
+		m_queue_size -= 1;
 	return msgb_dequeue(&queue);
 }