diff --git a/controller/internal/setup/templates/setup_restore_exec.html b/controller/internal/setup/templates/setup_restore_exec.html
index b927d96..874aa99 100644
--- a/controller/internal/setup/templates/setup_restore_exec.html
+++ b/controller/internal/setup/templates/setup_restore_exec.html
@@ -33,14 +33,13 @@
 
     <script>
     (function() {
+        // After restore, the setup server (port 8081) exits and the main
+        // controller restarts on port 8080. Poll port 8080 until it responds.
+        var mainURL = window.location.protocol + '//' + window.location.hostname + ':8080/';
         function waitForRestart() {
-            fetch('/', {redirect: 'follow'})
-                .then(function(r) {
-                    if (r.ok) {
-                        window.location.href = '/';
-                    } else {
-                        setTimeout(waitForRestart, 2000);
-                    }
+            fetch(mainURL, {redirect: 'follow', mode: 'no-cors'})
+                .then(function() {
+                    window.location.href = mainURL;
                 })
                 .catch(function() {
                     setTimeout(waitForRestart, 2000);