diff --git a/docs/snippets/common/my-addon-preset-implementation.js.mdx b/docs/snippets/common/my-addon-preset-implementation.js.mdx
index 6ad7df9ee3f..2f31ec25ac3 100644
--- a/docs/snippets/common/my-addon-preset-implementation.js.mdx
+++ b/docs/snippets/common/my-addon-preset-implementation.js.mdx
@@ -2,7 +2,7 @@
 // /my-addon/src/preset.js
 
 function managerEntries(entry = []) {
-  return [...entry, require.resolve("./manager")]; //👈 Addon implementation
+  return [...entry, require.resolve("./register")]; //👈 Addon implementation
 }
 
 module.exports = { managerEntries }
diff --git a/docs/snippets/common/storybook-addon-load-external-addons-preset.js.mdx b/docs/snippets/common/storybook-addon-load-external-addons-preset.js.mdx
index 9e2cac6af83..b13c6841ec8 100644
--- a/docs/snippets/common/storybook-addon-load-external-addons-preset.js.mdx
+++ b/docs/snippets/common/storybook-addon-load-external-addons-preset.js.mdx
@@ -2,7 +2,7 @@
 // my-preset/index.js
 
 function managerEntries(entry = []) {
-  return [...entry, require.resolve('my-other-addon/manager')];
+  return [...entry, require.resolve('my-other-addon/register')];
 }
 
 const config = (entry = [], options) => {
diff --git a/docs/snippets/common/storybook-addon-preset-example.js.mdx b/docs/snippets/common/storybook-addon-preset-example.js.mdx
index db1a7c26b59..a23a6ca04f3 100644
--- a/docs/snippets/common/storybook-addon-preset-example.js.mdx
+++ b/docs/snippets/common/storybook-addon-preset-example.js.mdx
@@ -6,7 +6,7 @@ export function config(entry = []) {
 }
 
 export function managerEntries(entries) {
-  return [...entries, require.resolve('./manager')];
+  return [...entries, require.resolve('./register')];
 }
 
 export const parameters = {
diff --git a/docs/snippets/common/storybook-main-register-presets-managerentry.js.mdx b/docs/snippets/common/storybook-main-register-presets-managerentry.js.mdx
index 3673c58dd3d..18fa46acdf1 100644
--- a/docs/snippets/common/storybook-main-register-presets-managerentry.js.mdx
+++ b/docs/snippets/common/storybook-main-register-presets-managerentry.js.mdx
@@ -3,7 +3,6 @@
 
 module.exports = {
   addons: [
-    '@storybook/addon-storysource/manager', // A managerEntry registered here, in this case from the storysource addon.
     '@storybook/addon-docs/preset', // A preset registered here, in this case from the addon-docs addon.
   ],
 };
diff --git a/docs/snippets/common/storybook-main-use-manager-entries.js.mdx b/docs/snippets/common/storybook-main-use-manager-entries.js.mdx
index 00b2730bf10..02479932037 100644
--- a/docs/snippets/common/storybook-main-use-manager-entries.js.mdx
+++ b/docs/snippets/common/storybook-main-use-manager-entries.js.mdx
@@ -2,6 +2,6 @@
 // .storybook/main.js
 
 module.exports = {
-  managerEntries: ['@storybook/addon-storysource/manager'],
+  managerEntries: ['some-storybook-addon/entry-point.js'],
 };
 ```
\ No newline at end of file
diff --git a/docs/snippets/common/storybook-storysource-manager-entries.js.mdx b/docs/snippets/common/storybook-storysource-manager-entries.js.mdx
index 4651d56bf56..e9c5dec6d95 100644
--- a/docs/snippets/common/storybook-storysource-manager-entries.js.mdx
+++ b/docs/snippets/common/storybook-storysource-manager-entries.js.mdx
@@ -1,7 +1,5 @@
 ```js
 // storysource/preset.js
 
-export function managerEntries(entry = []) {
-  return [...entry, require.resolve('@storybook/addon-storysource/manager')];
-}
+/* nothing needed */
 ```
\ No newline at end of file
diff --git a/lib/core-common/src/presets.ts b/lib/core-common/src/presets.ts
index 319f1a19504..268468c8df2 100644
--- a/lib/core-common/src/presets.ts
+++ b/lib/core-common/src/presets.ts
@@ -106,13 +106,20 @@ export const resolveAddonName = (
   }
 
   if (managerFile || registerFile || previewFile || presetFile) {
+    const managerEntries = [];
+
+    if (managerFile) {
+      managerEntries.push(managerFile);
+    }
+    // register file is the old way of registering addons
+    if (!managerFile && registerFile && !presetFile) {
+      managerEntries.push(registerFile);
+    }
+
     return {
       type: 'virtual',
       name: path,
-      // register file is the old way of registering addons
-      ...(managerFile || registerFile
-        ? { managerEntries: [managerFile, !presetFile && registerFile].filter(Boolean) }
-        : {}),
+      ...(managerEntries.length ? { managerEntries } : {}),
       ...(previewFile ? { previewAnnotations: [previewFile] } : {}),
       ...(presetFile ? { presets: [{ name: presetFile, options }] } : {}),
     };