diff --git a/src/packet-queue.c b/src/packet-queue.c
index 4b47beb2fb..cb766ff1b6 100644
--- a/src/packet-queue.c
+++ b/src/packet-queue.c
@@ -192,6 +192,8 @@ Packet *PacketDequeue (PacketQueue *q)
     }
 
     //PacketQueueValidateDebug(q);
+    p->next = NULL;
+    p->prev = NULL;
     return p;
 }
 
diff --git a/src/tmqh-packetpool.c b/src/tmqh-packetpool.c
index 75139254ee..c66025cf4d 100644
--- a/src/tmqh-packetpool.c
+++ b/src/tmqh-packetpool.c
@@ -307,6 +307,7 @@ void PacketPoolReturnPacket(Packet *p)
         PktPool *pending_pool = my_pool->pending_pool;
         if (pending_pool == NULL) {
             /* No pending packet, so store the current packet. */
+            p->next = NULL;
             my_pool->pending_pool = pool;
             my_pool->pending_head = p;
             my_pool->pending_tail = p;