diff --git a/code/lib/builder-webpack5/src/preview/iframe-webpack.config.ts b/code/lib/builder-webpack5/src/preview/iframe-webpack.config.ts
index a8de0de4baa..ecb620baa29 100644
--- a/code/lib/builder-webpack5/src/preview/iframe-webpack.config.ts
+++ b/code/lib/builder-webpack5/src/preview/iframe-webpack.config.ts
@@ -147,8 +147,6 @@ export default async (
 
     previewAnnotations.forEach((previewAnnotationFilename: string | undefined) => {
       if (!previewAnnotationFilename) return;
-      const previewApi = storybookPaths['@storybook/preview-api'];
-      const clientLogger = storybookPaths['@storybook/client-logger'];
 
       // Ensure that relative paths end up mapped to a filename in the cwd, so a later import
       // of the `previewAnnotationFilename` in the template works.
@@ -159,8 +157,6 @@ export default async (
       // file, see https://github.com/storybookjs/storybook/pull/16727#issuecomment-986485173
       virtualModuleMapping[entryFilename] = interpolate(entryTemplate, {
         previewAnnotationFilename,
-        previewApi,
-        clientLogger,
       });
       entries.push(entryFilename);
     });
diff --git a/code/lib/builder-webpack5/templates/virtualModuleEntry.template.js b/code/lib/builder-webpack5/templates/virtualModuleEntry.template.js
index d25b289bb40..d078efc3eb5 100644
--- a/code/lib/builder-webpack5/templates/virtualModuleEntry.template.js
+++ b/code/lib/builder-webpack5/templates/virtualModuleEntry.template.js
@@ -9,7 +9,7 @@ import {
   addArgsEnhancer,
   addArgTypesEnhancer,
   setGlobalRender,
-} from '{{previewApi}}';
+} from '@storybook/preview-api';
 import * as previewAnnotations from '{{previewAnnotationFilename}}';
 
 Object.keys(previewAnnotations).forEach((key) => {
diff --git a/code/ui/manager/src/components/preview/preview.tsx b/code/ui/manager/src/components/preview/preview.tsx
index 41f3f64dcc7..4e1b0c57df2 100644
--- a/code/ui/manager/src/components/preview/preview.tsx
+++ b/code/ui/manager/src/components/preview/preview.tsx
@@ -71,11 +71,15 @@ const createCanvas = (id: string, baseUrl = 'iframe.html', withLoader = true): A
 
           useEffect(() => {
             if (global.CONFIG_TYPE === 'DEVELOPMENT') {
-              const channel = addons.getServerChannel();
+              try {
+                const channel = addons.getServerChannel();
 
-              channel.on(PREVIEW_BUILDER_PROGRESS, (options) => {
-                setProgress(options);
-              });
+                channel.on(PREVIEW_BUILDER_PROGRESS, (options) => {
+                  setProgress(options);
+                });
+              } catch {
+                //
+              }
             }
           }, []);