diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index d482127cf40..490c82516c0 100644
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -2929,12 +2929,13 @@ function xmldb_main_upgrade($oldversion) {
 
     if ($oldversion < 2014012300.01) {
         // Remove deleted users home pages.
-        $active = $DB->get_fieldset_select('user', 'id', 'deleted = ?', array(0));
-        list($insql, $params) = $DB->get_in_or_equal($active, SQL_PARAMS_QM, 'param', false);
-        $sql = 'DELETE FROM {my_pages}
-                WHERE userid ' . $insql;
-
-        $DB->execute($sql, $params);
+        $sql = "DELETE FROM {my_pages}
+                WHERE EXISTS (SELECT {user}.id
+                                  FROM {user}
+                                  WHERE {user}.id = {my_pages}.userid
+                                  AND {user}.deleted = 1)
+                AND {my_pages}.private = 1";
+        $DB->execute($sql);
 
         // Reached main savepoint.
         upgrade_main_savepoint(true, 2014012300.01);