1 files changed, 3 insertions, 2 deletions

diff --git a/src/cadet/gnunet-service-cadet_tunnel.c b/src/cadet/gnunet-service-cadet_tunnel.c
index fffdb9102..2d8aa90b6 100644
--- a/src/cadet/gnunet-service-cadet_tunnel.c
+++ b/src/cadet/gnunet-service-cadet_tunnel.c
@@ -1838,8 +1838,9 @@ handle_ephemeral (struct CadetTunnel *t,
     {
       t->estate = CADET_TUNNEL_KEY_REKEY;
     }
-    if (GNUNET_SCHEDULER_NO_TASK == t->rekey_task)
-      t->rekey_task = GNUNET_SCHEDULER_add_now (rekey_tunnel, t);
+    if (GNUNET_SCHEDULER_NO_TASK != t->rekey_task)
+      GNUNET_SCHEDULER_cancel (t->rekey_task);
+    t->rekey_task = GNUNET_SCHEDULER_add_now (rekey_tunnel, t);
   }
   else if (CADET_TUNNEL_KEY_OK == t->estate)
   {