diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index 3db96635182..076d5caa191 100644
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -3023,5 +3023,17 @@ function xmldb_main_upgrade($oldversion) {
         upgrade_main_savepoint(true, 2020110901.03);
     }
 
+    if ($oldversion < 2020110901.08) {
+        // This upgrade step will update all shared events setting userid to 0.
+        // Site, category, course, group and action events (except user overrides) dont belong to the user who creates them.
+        $DB->execute("UPDATE {event} SET userid = 0 WHERE eventtype <> 'user' OR priority <> 0");
+
+        // Only user type of subscription should record user id.
+        $DB->execute("UPDATE {event_subscriptions} SET userid = 0 WHERE eventtype <> 'user'");
+
+        // Main savepoint reached.
+        upgrade_main_savepoint(true, 2020110901.08);
+    }
+
     return true;
 }
diff --git a/version.php b/version.php
index 7661db9c003..acf6b1535dc 100644
--- a/version.php
+++ b/version.php
@@ -29,7 +29,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$version  = 2020110901.07;              // 20201109      = branching date YYYYMMDD - do not modify!
+$version  = 2020110901.08;              // 20201109      = branching date YYYYMMDD - do not modify!
                                         //         RR    = release increments - 00 in DEV branches.
                                         //           .XX = incremental changes.
 $release  = '3.10.1+ (Build: 20210226)';// Human-friendly version name