diff --git a/packages/server/src/environment.ts b/packages/server/src/environment.ts
index a1701535ce..b0a35eedf5 100644
--- a/packages/server/src/environment.ts
+++ b/packages/server/src/environment.ts
@@ -32,6 +32,7 @@ const environment = {
   REDIS_PASSWORD: process.env.REDIS_PASSWORD,
   REDIS_CLUSTERED: process.env.REDIS_CLUSTERED,
   HTTP_MIGRATIONS: process.env.HTTP_MIGRATIONS,
+  CLUSTER_MODE: process.env.CLUSTER_MODE,
   API_REQ_LIMIT_PER_SEC: process.env.API_REQ_LIMIT_PER_SEC,
   GOOGLE_CLIENT_ID: process.env.GOOGLE_CLIENT_ID,
   GOOGLE_CLIENT_SECRET: process.env.GOOGLE_CLIENT_SECRET,
diff --git a/packages/server/src/startup.ts b/packages/server/src/startup.ts
index b4a287d2d4..fd07c5f530 100644
--- a/packages/server/src/startup.ts
+++ b/packages/server/src/startup.ts
@@ -58,7 +58,7 @@ export async function startup(app?: any, server?: any) {
     return
   }
   STARTUP_RAN = true
-  if (server) {
+  if (server && env.CLUSTER_MODE?.toLowerCase() !== "true") {
     console.log(`Budibase running on ${JSON.stringify(server.address())}`)
     env._set("PORT", server.address().port)
   }