diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 2812280894c..a2ae7ab0eae 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -8564,9 +8564,13 @@ function upgrade_set_timeout($max_execution_time=300) {
     }
 
     if (!$upgraderunning) {
-        // upgrade not running or aborted
-        print_error('upgradetimedout', 'admin', "$CFG->wwwroot/$CFG->admin/");
-        die;
+        if (CLI_SCRIPT) {
+            // never stop CLI upgrades
+            $upgraderunning = 0;
+        } else {
+            // web upgrade not running or aborted
+            print_error('upgradetimedout', 'admin', "$CFG->wwwroot/$CFG->admin/");
+        }
     }
 
     if ($max_execution_time < 60) {