diff --git a/lib/adminlib.php b/lib/adminlib.php
index 7aa0d472d5a..9d93918a232 100644
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -209,6 +209,7 @@ function uninstall_plugin($type, $name) {
     $DB->delete_records('event', ['component' => $component]);
 
     // Delete scheduled tasks.
+    $DB->delete_records('task_adhoc', ['component' => $component]);
     $DB->delete_records('task_scheduled', array('component' => $component));
 
     // Delete Inbound Message datakeys.
diff --git a/lib/tests/task_logging_test.php b/lib/tests/task_logging_test.php
index 39b86cd0729..0aff4da5a0a 100644
--- a/lib/tests/task_logging_test.php
+++ b/lib/tests/task_logging_test.php
@@ -441,6 +441,7 @@ class core_task_logmanager extends advanced_testcase {
      */
     protected function get_test_adhoc_task() : \core\task\adhoc_task {
         $task = $this->getMockForAbstractClass(\core\task\adhoc_task::class);
+        $task->set_component('core');
 
         // Mock a lock on the task.
         $lock = $this->getMockBuilder(\core\lock\lock::class)