1 files changed, 5 insertions, 0 deletions

diff --git a/src/cadet/gnunet-service-cadet_connection.c b/src/cadet/gnunet-service-cadet_connection.c
index 6dbabb5ab..da0d6e20d 100644
--- a/src/cadet/gnunet-service-cadet_connection.c
+++ b/src/cadet/gnunet-service-cadet_connection.c
@@ -1583,6 +1583,11 @@ connection_reset_timeout (struct CadetConnection *c, int fwd)
   if (GCC_is_origin (c, fwd)) /* Startpoint */
   {
     schedule_next_keepalive (c, fwd);
+    if (NULL != c->maintenance_q)
+    {
+      GCP_send_cancel (c->maintenance_q);
+      c->maintenance_q = NULL; /* Is set to NULL by conn_message_sent anyway */
+    }
   }
   else /* Relay, endpoint. */
   {