diff --git a/src/exchange/taler-exchange-httpd.c b/src/exchange/taler-exchange-httpd.c
index 780c4658d..0d001fde7 100644
--- a/src/exchange/taler-exchange-httpd.c
+++ b/src/exchange/taler-exchange-httpd.c
@@ -918,15 +918,6 @@ handle_mhd_request (void *cls,
 
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                 "Handling new request\n");
-    cnt = req_count++;
-    if (req_max == cnt)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  "Restarting exchange service after %llu requests\n",
-                  cnt);
-      (void) kill (getpid (),
-                   SIGTERM);
-    }
 
     /* We're in a new async scope! */
     rc = *con_cls = GNUNET_new (struct TEH_RequestContext);
@@ -1661,6 +1652,15 @@ connection_done (void *cls,
   if (NULL != input_filename)
     GNUNET_SCHEDULER_shutdown ();
 #endif
+  cnt = req_count++;
+  if (req_max == cnt)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Restarting exchange service after %llu requests\n",
+                cnt);
+    (void) kill (getpid (),
+                 SIGTERM);
+  }
 }