diff --git a/src/mhd/mhd_run.c b/src/mhd/mhd_run.c
index 7747358ff..8388fbff6 100644
--- a/src/mhd/mhd_run.c
+++ b/src/mhd/mhd_run.c
@@ -162,8 +162,8 @@ TALER_MHD_daemon_trigger (void)
   if (NULL != mhd_task)
   {
     GNUNET_SCHEDULER_cancel (mhd_task);
-    mhd_task = NULL;
-    run_daemon (NULL);
+    mhd_task = GNUNET_SCHEDULER_add_now (&run_daemon,
+                                         NULL);
   }
   else
   {