diff --git a/backup/util/ui/restore_ui_components.php b/backup/util/ui/restore_ui_components.php
index 744fafcbc56..b95681dee5a 100644
--- a/backup/util/ui/restore_ui_components.php
+++ b/backup/util/ui/restore_ui_components.php
@@ -166,21 +166,32 @@ abstract class restore_search_base implements renderable {
         list($sql, $params) = $this->get_searchsql();
         $blocksz = 5000;
         $offs = 0;
-        while ($resultset = $DB->get_records_sql($sql, $params, $offs, $blocksz)){
+        // Get total number, to avoid some incorrect iterations
+        $countsql = preg_replace('/ORDER BY.*/', '', $sql);
+        $totalcourses = $DB->count_records_sql("SELECT COUNT(*) FROM ($countsql) sel", $params);
+        // User to be checked is always the same (usually null, get it form first element)
+        $firstcap = reset($this->requiredcapabilities);
+        $userid = isset($firstcap['user']) ? $firstcap['user'] : null;
+        // Extract caps to check, this saves us a bunch of iterations
+        $requiredcaps = array();
+        foreach ($this->requiredcapabilities as $cap) {
+            $requiredcaps[] = $cap['capability'];
+        }
+        // Iterate while we have records and haven't reached MAXRESULTS
+        while ($totalcourses > $offs and $this->totalcount < self::$MAXRESULTS) {
+            $resultset = $DB->get_records_sql($sql, $params, $offs, $blocksz);
             foreach ($resultset as $result) {
                 context_instance_preload($result);
                 $context = get_context_instance($contextlevel, $result->id);
-                if (count($this->requiredcapabilities) > 0) {
-                    foreach ($this->requiredcapabilities as $cap) {
-                        if (!has_capability($cap['capability'], $context, $cap['user'])) {
-                            continue 2;
-                        }
+                if (count($requiredcaps) > 0) {
+                    if (!has_all_capabilities($requiredcaps, $context, $userid)) {
+                        continue;
                     }
                 }
                 $this->results[$result->id] = $result;
                 $this->totalcount++;
                 if ($this->totalcount >= self::$MAXRESULTS) {
-                    break 2;
+                    break;
                 }
             }
             $offs += $blocksz;