diff --git a/packages/server/src/api/controllers/static/index.ts b/packages/server/src/api/controllers/static/index.ts
index 4828181149..c23ea349d4 100644
--- a/packages/server/src/api/controllers/static/index.ts
+++ b/packages/server/src/api/controllers/static/index.ts
@@ -156,6 +156,10 @@ export const serveApp = async function (ctx: Ctx) {
     appHbsPath = join(__dirname, "templates", "app.hbs")
   }
 
+  const App = !needMigrations
+    ? require("./templates/BudibaseApp.svelte").default
+    : require("./templates/Updating.svelte").default
+
   let db
   try {
     db = context.getAppDB({ skip_setup: true })
@@ -163,7 +167,6 @@ export const serveApp = async function (ctx: Ctx) {
     let appId = context.getAppId()
 
     if (!env.isJest()) {
-      const App = require("./templates/BudibaseApp.svelte").default
       const plugins = objectStore.enrichPluginURLs(appInfo.usedPlugins)
       const { head, html, css } = App.render({
         metaImage:
@@ -200,7 +203,6 @@ export const serveApp = async function (ctx: Ctx) {
     }
   } catch (error) {
     if (!env.isJest()) {
-      const App = require("./templates/BudibaseApp.svelte").default
       const { head, html, css } = App.render({
         title: branding?.metaTitle,
         metaTitle: branding?.metaTitle,
diff --git a/packages/server/src/api/controllers/static/templates/Updating.svelte b/packages/server/src/api/controllers/static/templates/Updating.svelte
new file mode 100644
index 0000000000..5c7e23b5b3
--- /dev/null
+++ b/packages/server/src/api/controllers/static/templates/Updating.svelte
@@ -0,0 +1,8 @@
+<div class="loading">Updating the system...</div>
+
+<style>
+  .loading {
+    display: flex;
+    justify-content: center;
+  }
+</style>