diff --git a/maxutils/maxbase/src/worker.cc b/maxutils/maxbase/src/worker.cc
index 7b9638168..f060a8225 100644
--- a/maxutils/maxbase/src/worker.cc
+++ b/maxutils/maxbase/src/worker.cc
@@ -1032,7 +1032,10 @@ bool Worker::cancel_delayed_call(uint32_t id)
     }
     else
     {
-        mxb_assert(!true);
+        mxb_assert_message(!true,
+                           "Attempt to remove delayed call using non-existent id %u. "
+                           "Calling hktask_remove() from the task function? Simply "
+                           "return false instead.", id);
         MXB_WARNING("Attempt to remove a delayed call, associated with non-existing id.");
     }
 
diff --git a/server/modules/routing/binlogrouter/blr_master.cc b/server/modules/routing/binlogrouter/blr_master.cc
index a5f42a80c..f9fdaa4e4 100644
--- a/server/modules/routing/binlogrouter/blr_master.cc
+++ b/server/modules/routing/binlogrouter/blr_master.cc
@@ -1470,7 +1470,6 @@ static bool blr_check_last_master_event(void* inst)
                      "%s heartbeat",
                      router->service->name());
 
-            hktask_remove(task_name);
             router->heartbeat_task_active = false;
         }