1 files changed, 3 insertions, 0 deletions

diff --git a/src/util/mq.c b/src/util/mq.c
index 5e40059c2..a8d6bec43 100644
--- a/src/util/mq.c
+++ b/src/util/mq.c
@@ -791,6 +791,9 @@ GNUNET_MQ_destroy (struct GNUNET_MQ_Handle *mq)
 
   if (NULL != mq->current_envelope)
   {
+    /* we can only discard envelopes that
+     * are not queued! */
+    mq->current_envelope->parent_queue = NULL;
     GNUNET_MQ_discard (mq->current_envelope);
     mq->current_envelope = NULL;
   }