diff --git a/packages/builder/src/pages/builder/app/updating/[application].svelte b/packages/builder/src/pages/builder/app/updating/[application].svelte
index ec851fa08d..1f92861edf 100644
--- a/packages/builder/src/pages/builder/app/updating/[application].svelte
+++ b/packages/builder/src/pages/builder/app/updating/[application].svelte
@@ -2,6 +2,13 @@
   import { Updating } from "@budibase/frontend-core"
   import { redirect, params } from "@roxi/routify"
 
+  import { API } from "api"
+
+  async function isMigrationDone() {
+    const response = await API.getMigrationStatus()
+    return response.migrated
+  }
+
   async function onMigrationDone() {
     // For some reason routify params is not stripping the ? properly, so we need to check both with and without ?
     const returnUrl = $params.returnUrl || $params["?returnUrl"]
@@ -9,4 +16,4 @@
   }
 </script>
 
-<Updating {onMigrationDone} />
+<Updating {isMigrationDone} {onMigrationDone} />
diff --git a/packages/frontend-core/src/components/Updating.svelte b/packages/frontend-core/src/components/Updating.svelte
index 16e4b51de4..7d4a101fee 100644
--- a/packages/frontend-core/src/components/Updating.svelte
+++ b/packages/frontend-core/src/components/Updating.svelte
@@ -1,18 +1,17 @@
 <script>
-  import * as API from "../api"
-
+  export let isMigrationDone
   export let onMigrationDone
-  export let timeoutSeconds = 3 * 60 // 3 minutes
+  export let timeoutSeconds = 10 // 3 minutes
 
   const loadTime = Date.now()
   let timedOut = false
 
   async function checkMigrationsFinished() {
     setTimeout(async () => {
-      const response = await API.getMigrationStatus()
+      const isMigrated = await isMigrationDone()
 
       const timeoutMs = timeoutSeconds * 1000
-      if (!response.migrated) {
+      if (!isMigrated) {
         if (loadTime + timeoutMs > Date.now()) {
           return checkMigrationsFinished()
         }