diff --git a/lib/core/src/server/build-dev.ts b/lib/core/src/server/build-dev.ts
index 969a79e915f8..b27d3a72c46f 100644
--- a/lib/core/src/server/build-dev.ts
+++ b/lib/core/src/server/build-dev.ts
@@ -218,11 +218,13 @@ function outputStartupInformation(options: {
   );
 }
 
-async function outputStats(previewStats: Stats, managerStats: Stats) {
+async function outputStats(previewStats: Stats | undefined, managerStats: Stats | undefined) {
   if (previewStats) {
     await writeStats('preview', previewStats);
   }
-  await writeStats('manager', managerStats);
+  if (managerStats) {
+    await writeStats('manager', managerStats);
+  }
   logger.info(
     `stats written to => ${chalk.cyan(resolvePathInStorybookCache('public/[name].json'))}`
   );
@@ -282,9 +284,9 @@ export async function buildDevStandalone(
 
     if (options.smokeTest) {
       await outputStats(previewStats, managerStats);
-      const managerWarnings = (managerStats as any).toJson().warnings.length > 0;
+      const managerWarnings = !!managerStats && managerStats.toJson().warnings.length > 0;
       const previewWarnings =
-        !options.ignorePreview && (previewStats as any).toJson().warnings.length > 0;
+        !options.ignorePreview && !!previewStats && previewStats.toJson().warnings.length > 0;
       process.exit(managerWarnings || previewWarnings ? 1 : 0);
       return;
     }
diff --git a/lib/core/src/server/dev-server.ts b/lib/core/src/server/dev-server.ts
index e440cd9b4b48..fccb0cc3ba5b 100644
--- a/lib/core/src/server/dev-server.ts
+++ b/lib/core/src/server/dev-server.ts
@@ -239,9 +239,7 @@ const startManager = async ({
   }
 
   if (!managerConfig) {
-    // FIXME: This object containing default values should match ManagerResult
-    // @ts-ignore
-    return { managerStats: {}, managerTotalTime: 0 } as ManagerResult;
+    return { managerTotalTime: [0, 0] };
   }
 
   const compiler = webpack(managerConfig);
@@ -279,9 +277,7 @@ const startPreview = async ({
   outputDir,
 }: any): Promise<PreviewResult> => {
   if (options.ignorePreview) {
-    // FIXME: This object containing default values should match PreviewResult
-    // @ts-ignore
-    return { previewStats: {}, previewTotalTime: 0 } as PreviewResult;
+    return { previewTotalTime: [0, 0] };
   }
 
   const previewConfig = await loadConfig({
diff --git a/lib/core/src/server/types.ts b/lib/core/src/server/types.ts
index 6993a9dd0dbf..bebd3ef1c2a4 100644
--- a/lib/core/src/server/types.ts
+++ b/lib/core/src/server/types.ts
@@ -94,12 +94,12 @@ export interface ReleaseNotesData {
 }
 
 export interface PreviewResult {
-  previewStats: Stats;
+  previewStats?: Stats;
   previewTotalTime: [number, number];
 }
 
 export interface ManagerResult {
-  managerStats: Stats;
+  managerStats?: Stats;
   managerTotalTime: [number, number];
 }