diff --git a/integration-tests/environment-helpers/bootstrap-app.js b/integration-tests/environment-helpers/bootstrap-app.js
index 035dd02a94..5e7578e78f 100644
--- a/integration-tests/environment-helpers/bootstrap-app.js
+++ b/integration-tests/environment-helpers/bootstrap-app.js
@@ -63,15 +63,17 @@ module.exports = {
     }
 
     return await new Promise((resolve, reject) => {
-      expressServer = app.listen(port, async (err) => {
-        if (err) {
+      expressServer = app
+        .listen(port)
+        .on("error", async (err) => {
           await shutdown()
           return reject(err)
-        }
-        setPort(port)
-        process.send(port)
-        resolve(shutdown)
-      })
+        })
+        .on("listening", () => {
+          setPort(port)
+          process.send(port)
+          resolve(shutdown)
+        })
 
       setExpressServer(expressServer)
     })
diff --git a/packages/core/medusa-test-utils/src/medusa-test-runner-utils/bootstrap-app.ts b/packages/core/medusa-test-utils/src/medusa-test-runner-utils/bootstrap-app.ts
index dd80a316ef..707a58e821 100644
--- a/packages/core/medusa-test-utils/src/medusa-test-runner-utils/bootstrap-app.ts
+++ b/packages/core/medusa-test-utils/src/medusa-test-runner-utils/bootstrap-app.ts
@@ -60,18 +60,21 @@ export async function startApp({
   }
 
   return await new Promise((resolve, reject) => {
-    const server = app.listen(port).on("error", async (err) => {
-      await shutdown()
-      return reject(err)
-    })
+    const server = app
+      .listen(port)
+      .on("error", async (err) => {
+        await shutdown()
+        return reject(err)
+      })
+      .on("listening", () => {
+        process.send?.(port)
 
-    process.send?.(port)
-
-    resolve({
-      shutdown,
-      container,
-      port,
-    })
+        resolve({
+          shutdown,
+          container,
+          port,
+        })
+      })
 
     // TODO: fix that once we find the appropriate place to put this util
     const {
diff --git a/packages/medusa/src/commands/start-cluster.ts b/packages/medusa/src/commands/start-cluster.ts
index 93fd040a78..08285ae95c 100644
--- a/packages/medusa/src/commands/start-cluster.ts
+++ b/packages/medusa/src/commands/start-cluster.ts
@@ -61,10 +61,7 @@ export default async function ({ port, cpus, directory }) {
       })
       const serverActivity = Logger.activity(`Creating server`)
       const server = GracefulShutdownServer.create(
-        app.listen(port).on("error", (err) => {
-          if (err) {
-            return
-          }
+        app.listen(port).on("listening", () => {
           Logger.success(serverActivity, `Server is ready on port: ${port}`)
           track("CLI_START_COMPLETED")
         })
diff --git a/packages/medusa/src/commands/start.ts b/packages/medusa/src/commands/start.ts
index dbc7093c02..310fcda2b6 100644
--- a/packages/medusa/src/commands/start.ts
+++ b/packages/medusa/src/commands/start.ts
@@ -26,10 +26,7 @@ export default async function ({ port, directory }) {
 
       const serverActivity = Logger.activity(`Creating server`)
       const server = GracefulShutdownServer.create(
-        app.listen(port).on("error", (err) => {
-          if (err) {
-            return
-          }
+        app.listen(port).on("listening", () => {
           Logger.success(serverActivity, `Server is ready on port: ${port}`)
           track("CLI_START_COMPLETED")
         })