diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 9ca5860eadf..4080ecfbad1 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -4222,7 +4222,10 @@ function delete_user(stdClass $user) {
 
     // Now do a brute force cleanup.
 
-    // Remove user's calendar subscriptions.
+    // Delete all user events and subscription events.
+    $DB->delete_records_select('event', 'userid = :userid AND subscriptionid IS NOT NULL', ['userid' => $user->id]);
+
+    // Now, delete all calendar subscription from the user.
     $DB->delete_records('event_subscriptions', ['userid' => $user->id]);
 
     // Remove from all cohorts.