diff --git a/app/react/package.json b/app/react/package.json
index 3a80a64a7f2..552e63765de 100644
--- a/app/react/package.json
+++ b/app/react/package.json
@@ -57,6 +57,7 @@
     "webpack": "^4.33.0"
   },
   "devDependencies": {
+    "@storybook/client-api": "6.0.0-alpha.15",
     "@types/mini-css-extract-plugin": "^0.9.0",
     "@types/node": "^13.5.3",
     "@types/webpack": "^4.41.0"
diff --git a/app/react/src/client/preview/types.ts b/app/react/src/client/preview/types.ts
index d0b7c04d8f5..77efa5ee92e 100644
--- a/app/react/src/client/preview/types.ts
+++ b/app/react/src/client/preview/types.ts
@@ -1,6 +1,7 @@
 import { ReactElement } from 'react';
 
-export { RenderContext } from '@storybook/core';
+// eslint-disable-next-line import/no-extraneous-dependencies
+export { RenderContext } from '@storybook/client-api';
 
 export interface ShowErrorArgs {
   title: string;
diff --git a/lib/client-api/src/types.ts b/lib/client-api/src/types.ts
index 4adfff4ebcd..38478c0d826 100644
--- a/lib/client-api/src/types.ts
+++ b/lib/client-api/src/types.ts
@@ -67,3 +67,13 @@ export interface GetStorybookKind {
   fileName: string;
   stories: GetStorybookStory[];
 }
+
+// This really belongs in lib/core, but that depends on lib/ui which (dev) depends on app/react
+// which needs this type. So we put it here to avoid the circular dependency problem.
+export type RenderContext = StoreItem & {
+  forceRender: boolean;
+
+  showMain: () => void;
+  showError: (error: { title: string; description: string }) => void;
+  showException: (err: Error) => void;
+};
diff --git a/lib/core/src/client/preview/types.ts b/lib/core/src/client/preview/types.ts
index 00807f5faa1..aa1c87bd849 100644
--- a/lib/core/src/client/preview/types.ts
+++ b/lib/core/src/client/preview/types.ts
@@ -1,4 +1,4 @@
-import { StoreItem } from '@storybook/client-api';
+import { StoreItem, RenderContext } from '@storybook/client-api';
 
 export interface PreviewError {
   message?: string;
@@ -23,13 +23,7 @@ export type RequireContext = {
 export type LoaderFunction = () => void | any[];
 export type Loadable = RequireContext | RequireContext[] | LoaderFunction;
 
-export type RenderContext = StoreItem & {
-  forceRender: boolean;
-
-  showMain: () => void;
-  showError: (error: { title: string; description: string }) => void;
-  showException: (err: Error) => void;
-};
+export { RenderContext };
 
 // The function used by a framework to render story to the DOM
 export type RenderStoryFunction = (context: RenderContext) => void;