diff --git a/src/http/message/queue/get.c b/src/http/message/queue/get.c
index 00f63a6..858be26 100644
--- a/src/http/message/queue/get.c
+++ b/src/http/message/queue/get.c
@@ -34,10 +34,15 @@ httpMessageQueueGet(HttpMessageQueue this)
 		return NULL;
 	}
 
-	msg = this->first->msg;
+	msg   = this->first->msg;
 	first = this->first->next;
+
+	if (this->first == this->last) {
+		this->last = NULL;
+	}
 	delete(this->first);
 
+	this->next  = first;
 	this->first = first;
 	this->nmsg--;