1 files changed, 5 insertions, 0 deletions

diff --git a/src/util/server_nc.c b/src/util/server_nc.c
index f6b0d8e22..6e0181ecb 100644
--- a/src/util/server_nc.c
+++ b/src/util/server_nc.c
@@ -236,6 +236,11 @@ GNUNET_SERVER_notification_context_destroy (struct
     GNUNET_CONTAINER_DLL_remove (nc->clients_head,
                                  nc->clients_tail,
                                  pos);
+    if (NULL != pos->th)
+    {
+      GNUNET_SERVER_notify_transmit_ready_cancel(pos->th);
+      pos->th = NULL;
+    }
     GNUNET_SERVER_client_drop (pos->client);
     while (NULL != (pml = pos->pending_head))
     {