diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index eb8ab08c12e..d3acfec7d50 100644
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -2542,25 +2542,6 @@ function xmldb_main_upgrade($oldversion) {
         upgrade_main_savepoint(true, 2020072300.01);
     }
 
-    if ($oldversion < 2020081400.01) {
-        // Delete all user evidence files from users that have been deleted.
-        $sql = "SELECT DISTINCT f.*
-                  FROM {files} f
-             LEFT JOIN {context} c ON f.contextid = c.id
-             LEFT JOIN {user} u ON c.instanceid = u.id
-                 WHERE f.component = :component
-                   AND f.filearea = :filearea
-                   AND u.deleted = 1";
-        $stalefiles = $DB->get_records_sql($sql, ['component' => 'core_competency', 'filearea' => 'userevidence']);
-
-        $fs = get_file_storage();
-        foreach ($stalefiles as $stalefile) {
-            $fs->get_file_instance($stalefile)->delete();
-        }
-
-        upgrade_main_savepoint(true, 2020081400.01);
-    }
-
     if ($oldversion < 2021052500.01) {
 
         // Define field timecreated to be added to task_adhoc.
@@ -2576,5 +2557,23 @@ function xmldb_main_upgrade($oldversion) {
         upgrade_main_savepoint(true, 2021052500.01);
     }
 
+    if ($oldversion < 2021052500.02) {
+        // Delete all user evidence files from users that have been deleted.
+        $sql = "SELECT DISTINCT f.*
+                  FROM {files} f
+             LEFT JOIN {context} c ON f.contextid = c.id
+                 WHERE f.component = :component
+                   AND f.filearea = :filearea
+                   AND c.id IS NULL";
+        $stalefiles = $DB->get_records_sql($sql, ['component' => 'core_competency', 'filearea' => 'userevidence']);
+
+        $fs = get_file_storage();
+        foreach ($stalefiles as $stalefile) {
+            $fs->get_file_instance($stalefile)->delete();
+        }
+
+        upgrade_main_savepoint(true, 2021052500.02);
+    }
+
     return true;
 }
diff --git a/version.php b/version.php
index a397da25142..3e2743e3177 100644
--- a/version.php
+++ b/version.php
@@ -29,7 +29,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$version  = 2021052500.01;              // YYYYMMDD      = weekly release date of this DEV branch.
+$version  = 2021052500.02;              // YYYYMMDD      = weekly release date of this DEV branch.
                                         //         RR    = release increments - 00 in DEV branches.
                                         //           .XX = incremental changes.
 $release  = '4.0dev (Build: 20200814)'; // Human-friendly version name