diff --git a/src/exchange/taler-exchange-wirewatch.c b/src/exchange/taler-exchange-wirewatch.c
index 43c5f7642..21d96668b 100644
--- a/src/exchange/taler-exchange-wirewatch.c
+++ b/src/exchange/taler-exchange-wirewatch.c
@@ -180,6 +180,11 @@ shutdown_task (void *cls)
   struct WireAccount *wa;
 
   (void) cls;
+  if (NULL != hh)
+  {
+    TALER_BANK_credit_history_cancel (hh);
+    hh = NULL;
+  }
   if (NULL != ctx)
   {
     GNUNET_CURL_fini (ctx);
@@ -195,11 +200,6 @@ shutdown_task (void *cls)
     GNUNET_SCHEDULER_cancel (task);
     task = NULL;
   }
-  if (NULL != hh)
-  {
-    TALER_BANK_credit_history_cancel (hh);
-    hh = NULL;
-  }
   TALER_EXCHANGEDB_plugin_unload (db_plugin);
   db_plugin = NULL;
   while (NULL != (wa = wa_head))