1 files changed, 3 insertions, 1 deletions

diff --git a/src/set/gnunet-service-set.c b/src/set/gnunet-service-set.c
index 3e6e0791a..4168685f1 100644
--- a/src/set/gnunet-service-set.c
+++ b/src/set/gnunet-service-set.c
@@ -223,6 +223,9 @@ listener_destroy (struct Listener *listener)
   {
     struct GNUNET_SERVICE_Client *client = listener->client;
 
+    GNUNET_MQ_destroy (listener->client_mq);
+    listener->client_mq = NULL;
+
     listener->client = NULL;
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Disconnecting listener client\n");
@@ -233,7 +236,6 @@ listener_destroy (struct Listener *listener)
   GNUNET_CONTAINER_DLL_remove (listeners_head,
                                listeners_tail,
                                listener);
-  *listener = (struct Listener) { 0 };
   GNUNET_free (listener);
 }