diff --git a/code/lib/core-server/src/build-static.ts b/code/lib/core-server/src/build-static.ts
index d3b8f4faf74..e82aca4bf78 100644
--- a/code/lib/core-server/src/build-static.ts
+++ b/code/lib/core-server/src/build-static.ts
@@ -172,23 +172,6 @@ export async function buildStaticStandalone(
     );
   }
 
-  if (!core?.disableTelemetry) {
-    effects.push(
-      initializedStoryIndexGenerator.then(async (generator) => {
-        const storyIndex = await generator?.getIndex();
-        const payload = {
-          precedingUpgrade: await getPrecedingUpgrade(),
-        };
-        if (storyIndex) {
-          Object.assign(payload, {
-            storyIndex: summarizeIndex(storyIndex),
-          });
-        }
-        await telemetry('build', payload, { configDir: options.configDir });
-      })
-    );
-  }
-
   if (!core?.disableProjectJson) {
     effects.push(
       extractStorybookMetadata(join(options.outputDir, 'project.json'), options.configDir)
@@ -223,5 +206,23 @@ export async function buildStaticStandalone(
     ...effects,
   ]);
 
+  // Now the code has successfully built, we can count this as a 'dev' event.
+  if (!core?.disableTelemetry) {
+    effects.push(
+      initializedStoryIndexGenerator.then(async (generator) => {
+        const storyIndex = await generator?.getIndex();
+        const payload = {
+          precedingUpgrade: await getPrecedingUpgrade(),
+        };
+        if (storyIndex) {
+          Object.assign(payload, {
+            storyIndex: summarizeIndex(storyIndex),
+          });
+        }
+        await telemetry('build', payload, { configDir: options.configDir });
+      })
+    );
+  }
+
   logger.info(`=> Output directory: ${options.outputDir}`);
 }
diff --git a/code/lib/core-server/src/dev-server.ts b/code/lib/core-server/src/dev-server.ts
index 906c39b4362..1b87fadd222 100644
--- a/code/lib/core-server/src/dev-server.ts
+++ b/code/lib/core-server/src/dev-server.ts
@@ -37,8 +37,6 @@ export async function storybookDevServer(options: Options) {
     serverChannel
   );
 
-  doTelemetry(core, initializedStoryIndexGenerator, options);
-
   app.use(compression({ level: 1 }));
 
   if (typeof options.extendServer === 'function') {
@@ -120,5 +118,10 @@ export async function storybookDevServer(options: Options) {
     }
   });
 
-  return { previewResult: await previewStarted, managerResult, address, networkAddress };
+  const previewResult = await previewStarted;
+
+  // Now the preview has successfully started, we can count this as a 'dev' event.
+  doTelemetry(core, initializedStoryIndexGenerator, options);
+
+  return { previewResult, managerResult, address, networkAddress };
 }