diff --git a/packages/builder/src/api.js b/packages/builder/src/api.js
index e93dae65f8..2fa48273f0 100644
--- a/packages/builder/src/api.js
+++ b/packages/builder/src/api.js
@@ -46,8 +46,12 @@ export const API = createAPIClient({
     }
   },
   onMigrationDetected: appId => {
-    window.location = `/builder/updating/${appId}?returnUrl=${encodeURI(
-      window.location
-    )}`
+    const updatingUrl = `/builder/updating/${appId}`
+
+    if (window.location.pathname === updatingUrl) {
+      return
+    }
+
+    window.location = `${updatingUrl}?returnUrl=${encodeURI(window.location)}`
   },
 })
diff --git a/packages/builder/src/pages/builder/updating/[appId].svelte b/packages/builder/src/pages/builder/updating/[appId].svelte
new file mode 100644
index 0000000000..69a2d58eed
--- /dev/null
+++ b/packages/builder/src/pages/builder/updating/[appId].svelte
@@ -0,0 +1,14 @@
+<script>
+  import Spinner from "components/common/Spinner.svelte"
+</script>
+
+<div class="loading">
+  <Spinner size="20" />
+</div>
+
+<style>
+  .loading {
+    display: flex;
+    justify-content: center;
+  }
+</style>