diff --git a/packages/generator-volto/generators/app/templates/.storybook/main.js b/packages/generator-volto/generators/app/templates/.storybook/main.js
index 0455b194c9..40eba7d3fc 100644
--- a/packages/generator-volto/generators/app/templates/.storybook/main.js
+++ b/packages/generator-volto/generators/app/templates/.storybook/main.js
@@ -70,6 +70,18 @@ module.exports = {
     '@storybook/addon-essentials',
     // '@storybook/preset-scss',
   ],
+  typescript: {
+    check: false,
+    checkOptions: {},
+    reactDocgen: 'react-docgen-typescript-plugin',
+    reactDocgenTypescriptOptions: {
+      compilerOptions: {
+        allowSyntheticDefaultImports: false,
+        esModuleInterop: false,
+      },
+      propFilter: () => true,
+    },
+  },
   webpackFinal: async (config, { configType }) => {
     // `configType` has a value of 'DEVELOPMENT' or 'PRODUCTION'
     // You can change the configuration based on that.
@@ -91,7 +103,7 @@ module.exports = {
       [],
       defaultRazzleOptions,
     );
-    const AddonConfigurationRegistry = require('@plone/volto/addon-registry');
+    const AddonConfigurationRegistry = require('@plone/registry/src/addon-registry');
 
     const registry = new AddonConfigurationRegistry(projectRootPath);
 
@@ -135,9 +147,10 @@ module.exports = {
     };
 
     // Addons have to be loaded with babel
-    const addonPaths = registry.addonNames.map((addon) =>
-      fs.realpathSync(registry.packages[addon].modulePath),
-    );
+    const addonPaths = registry
+      .getAddons()
+      .map((addon) => fs.realpathSync(addon.modulePath));
+
     resultConfig.module.rules[1].exclude = (input) =>
       // exclude every input from node_modules except from @plone/volto
       /node_modules\/(?!(@plone\/volto)\/)/.test(input) &&
diff --git a/packages/generator-volto/news/5911.internal b/packages/generator-volto/news/5911.internal
new file mode 100644
index 0000000000..a670273838
--- /dev/null
+++ b/packages/generator-volto/news/5911.internal
@@ -0,0 +1 @@
+Fix StoryBook for project generator in Volto 18 @sneridagh
diff --git a/packages/volto/.storybook/main.js b/packages/volto/.storybook/main.js
index 76d33e53d4..a2a9659b0b 100644
--- a/packages/volto/.storybook/main.js
+++ b/packages/volto/.storybook/main.js
@@ -1,12 +1,13 @@
 const webpack = require('webpack');
 const fs = require('fs');
 const path = require('path');
-const makeLoaderFinder = require('razzle-dev-utils/makeLoaderFinder');
-const fileLoaderFinder = makeLoaderFinder('file-loader');
+
 const projectRootPath = path.resolve('.');
 const lessPlugin = require('../webpack-plugins/webpack-less-plugin');
+
 const createConfig = require('../node_modules/razzle/config/createConfigAsync.js');
 const razzleConfig = require(path.join(projectRootPath, 'razzle.config.js'));
+
 const SVGLOADER = {
   test: /icons\/.*\.svg$/,
   use: [
diff --git a/packages/volto/news/5911.internal b/packages/volto/news/5911.internal
new file mode 100644
index 0000000000..6784a1a476
--- /dev/null
+++ b/packages/volto/news/5911.internal
@@ -0,0 +1 @@
+Remove dangling unused lines in StoryBook config @sneridagh