diff --git a/code/lib/cli/src/automigrate/fixes/upgrade-storybook-related-dependencies.test.ts b/code/lib/cli/src/automigrate/fixes/upgrade-storybook-related-dependencies.test.ts
new file mode 100644
index 000000000000..0c16309647bd
--- /dev/null
+++ b/code/lib/cli/src/automigrate/fixes/upgrade-storybook-related-dependencies.test.ts
@@ -0,0 +1,95 @@
+import { describe, afterEach, it, expect, vi } from 'vitest';
+import type { StorybookConfig } from '@storybook/types';
+import type { JsPackageManager } from '@storybook/core-common';
+import * as docsUtils from '../../doctor/getIncompatibleStorybookPackages';
+
+import { upgradeStorybookRelatedDependencies } from './upgrade-storybook-related-dependencies';
+
+vi.mock('../../doctor/getIncompatibleStorybookPackages');
+
+const check = async ({
+  packageManager,
+  main: mainConfig = {},
+  storybookVersion = '8.0.0',
+}: {
+  packageManager: Partial<JsPackageManager>;
+  main?: Partial<StorybookConfig> & Record<string, unknown>;
+  storybookVersion?: string;
+}) => {
+  return upgradeStorybookRelatedDependencies.check({
+    packageManager: packageManager as any,
+    configDir: '',
+    mainConfig: mainConfig as any,
+    storybookVersion,
+  });
+};
+
+describe('upgrade-storybook-related-dependencies fix', () => {
+  afterEach(() => {
+    vi.restoreAllMocks();
+  });
+
+  it('should detect storyshots registered in main.js', async () => {
+    const analyzedPackages = [
+      {
+        packageName: '@chromatic-com/storybook',
+        packageVersion: '1.2.9',
+        availableUpgrade: '2.0.0',
+        hasIncompatibleDependencies: false,
+      },
+      {
+        packageName: '@storybook/jest',
+        packageVersion: '0.2.3',
+        availableUpgrade: '1.0.0',
+        hasIncompatibleDependencies: false,
+      },
+      {
+        packageName: '@storybook/preset-create-react-app',
+        packageVersion: '3.2.0',
+        availableUpgrade: '8.0.0',
+        hasIncompatibleDependencies: true,
+      },
+      {
+        packageName: 'storybook',
+        packageVersion: '8.0.0',
+        availableUpgrade: undefined,
+        hasIncompatibleDependencies: true,
+      },
+    ];
+    vi.mocked(docsUtils.getIncompatibleStorybookPackages).mockResolvedValue(analyzedPackages);
+    await expect(
+      check({
+        packageManager: {
+          getAllDependencies: async () => ({
+            '@chromatic-com/storybook': '1.2.9',
+            '@storybook/jest': '0.2.3',
+            '@storybook/preset-create-react-app': '3.2.0',
+            storybook: '8.0.0',
+          }),
+          latestVersion: async (pkgName) =>
+            analyzedPackages.find((pkg) => pkg.packageName === pkgName)?.availableUpgrade || '',
+        },
+      })
+    ).resolves.toMatchInlineSnapshot(`
+      {
+        "upgradable": [
+          {
+            "afterVersion": "2.0.0",
+            "beforeVersion": "1.2.9",
+            "packageName": "@chromatic-com/storybook",
+          },
+          {
+            "afterVersion": "1.0.0",
+            "beforeVersion": "0.2.3",
+            "packageName": "@storybook/jest",
+          },
+          {
+            "afterVersion": "8.0.0",
+            "beforeVersion": "3.2.0",
+            "packageName": "@storybook/preset-create-react-app",
+          },
+        ],
+      }
+    `);
+  });
+});
diff --git a/code/lib/cli/src/automigrate/fixes/upgrade-storybook-related-dependencies.ts b/code/lib/cli/src/automigrate/fixes/upgrade-storybook-related-dependencies.ts
index c780d5eff59e..5614b7e35ad0 100644
--- a/code/lib/cli/src/automigrate/fixes/upgrade-storybook-related-dependencies.ts
+++ b/code/lib/cli/src/automigrate/fixes/upgrade-storybook-related-dependencies.ts
@@ -1,10 +1,10 @@
 import { dedent } from 'ts-dedent';
-import type { Fix } from '../types';
 import { cyan, yellow } from 'chalk';
-import { getIncompatibleStorybookPackages } from '../../doctor/getIncompatibleStorybookPackages';
 import { valid, coerce } from 'semver';
 import type { JsPackageManager } from '@storybook/core-common';
 import { isCorePackage } from '@storybook/core-common';
+import type { Fix } from '../types';
+import { getIncompatibleStorybookPackages } from '../../doctor/getIncompatibleStorybookPackages';
 
 type PackageMetadata = {
   packageName: string;
@@ -74,12 +74,10 @@ export const upgradeStorybookRelatedDependencies = {
     ).map((packageName) => [packageName, allDependencies[packageName]]) as [string, string][];
 
     const packageVersions = await getLatestVersions(packageManager, uniquePackages);
+
     const upgradablePackages = packageVersions.filter(
       ({ packageName, afterVersion, beforeVersion }) => {
-        if (beforeVersion === null) {
-          return false;
-        }
-        if (afterVersion === null) {
+        if (beforeVersion === null || afterVersion === null) {
           return false;
         }