diff --git a/src/exchange/taler-exchange-httpd.c b/src/exchange/taler-exchange-httpd.c
index 657a9e744..c0e91250d 100644
--- a/src/exchange/taler-exchange-httpd.c
+++ b/src/exchange/taler-exchange-httpd.c
@@ -841,6 +841,8 @@ run_single_request ()
     }
     MHD_run (mhd);
   }
+  MHD_stop_daemon (mhd);
+  mhd = NULL;
   if (cld != waitpid (cld,
                       &status,
                       0))