diff --git a/packages/gatsby/src/executors/server/server.impl.ts b/packages/gatsby/src/executors/server/server.impl.ts
index 8a30230377..2f8a4da737 100644
--- a/packages/gatsby/src/executors/server/server.impl.ts
+++ b/packages/gatsby/src/executors/server/server.impl.ts
@@ -119,6 +119,16 @@ function runGatsbyServe(
       { cwd: join(workspaceRoot, projectRoot) }
     );
 
+    childProcess.on('message', ({ action }: any) => {
+      if (
+        action?.type === 'LOG' &&
+        action?.payload?.text?.includes(options.host) &&
+        action?.payload?.text?.includes(options.port)
+      ) {
+        resolve(true);
+      }
+    });
+
     childProcess.on('error', (err) => {
       reject(err);
     });