diff --git a/superset-frontend/.storybook/preview.jsx b/superset-frontend/.storybook/preview.jsx
index 42784d2d1..ef27f3591 100644
--- a/superset-frontend/.storybook/preview.jsx
+++ b/superset-frontend/.storybook/preview.jsx
@@ -18,6 +18,7 @@
  */
 import { withJsx } from '@mihkeleidast/storybook-addon-source';
 import { supersetTheme, ThemeProvider } from '@superset-ui/core';
+import { AntdThemeProvider } from '../src/components/AntdThemeProvider';
 import { combineReducers, createStore, applyMiddleware, compose } from 'redux';
 import thunk from 'redux-thunk';
 import { Provider } from 'react-redux';
@@ -35,10 +36,10 @@ const store = createStore(
 
 const themeDecorator = Story => (
   <ThemeProvider theme={supersetTheme}>
-    <>
+    <AntdThemeProvider>
       <GlobalStyles />
       <Story />
-    </>
+    </AntdThemeProvider>
   </ThemeProvider>
 );
 
diff --git a/superset-frontend/src/components/Badge/Badge.stories.tsx b/superset-frontend/src/components/Badge/Badge.stories.tsx
index 781f6220c..505c51ab3 100644
--- a/superset-frontend/src/components/Badge/Badge.stories.tsx
+++ b/superset-frontend/src/components/Badge/Badge.stories.tsx
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { AntdThemeProvider } from 'src/components/AntdThemeProvider';
 import Badge, { BadgeProps } from '.';
 
 export default {
@@ -59,11 +58,7 @@ const SIZES = {
   defaultValue: undefined,
 };
 
-export const InteractiveBadge = (args: BadgeProps) => (
-  <AntdThemeProvider>
-    <Badge {...args} />
-  </AntdThemeProvider>
-);
+export const InteractiveBadge = (args: BadgeProps) => <Badge {...args} />;
 
 InteractiveBadge.args = {
   count: undefined,
@@ -120,16 +115,14 @@ export const BadgeGallery = () => (
     {SIZES.options.map(size => (
       <div key={size} style={{ marginBottom: 40 }}>
         <h4>{size}</h4>
-        <AntdThemeProvider>
-          {COLORS.options.map(color => (
-            <Badge
-              count={9}
-              size={size}
-              key={`${color}_${size}`}
-              style={{ marginRight: '15px' }}
-            />
-          ))}
-        </AntdThemeProvider>
+        {COLORS.options.map(color => (
+          <Badge
+            count={9}
+            size={size}
+            key={`${color}_${size}`}
+            style={{ marginRight: '15px' }}
+          />
+        ))}
       </div>
     ))}
   </>
diff --git a/superset-frontend/src/components/Card/Card.stories.tsx b/superset-frontend/src/components/Card/Card.stories.tsx
index 83ad2369e..dad913826 100644
--- a/superset-frontend/src/components/Card/Card.stories.tsx
+++ b/superset-frontend/src/components/Card/Card.stories.tsx
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { AntdThemeProvider } from 'src/components/AntdThemeProvider';
 import Card, { CardProps } from '.';
 
 export default {
@@ -24,11 +23,7 @@ export default {
   component: Card,
 };
 
-export const InteractiveCard = (args: CardProps) => (
-  <AntdThemeProvider>
-    <Card {...args} />
-  </AntdThemeProvider>
-);
+export const InteractiveCard = (args: CardProps) => <Card {...args} />;
 
 InteractiveCard.args = {
   padded: true,
diff --git a/superset-frontend/src/components/ProgressBar/ProgressBar.stories.tsx b/superset-frontend/src/components/ProgressBar/ProgressBar.stories.tsx
index 62ad8ae20..37f653575 100644
--- a/superset-frontend/src/components/ProgressBar/ProgressBar.stories.tsx
+++ b/superset-frontend/src/components/ProgressBar/ProgressBar.stories.tsx
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { AntdThemeProvider } from 'src/components/AntdThemeProvider';
 import ProgressBar, { ProgressBarProps } from '.';
 
 export default {
@@ -25,21 +24,15 @@ export default {
 };
 
 export const InteractiveProgressBar = (args: ProgressBarProps) => (
-  <AntdThemeProvider>
-    <ProgressBar {...args} type="line" />
-  </AntdThemeProvider>
+  <ProgressBar {...args} type="line" />
 );
 
 export const InteractiveProgressCircle = (args: ProgressBarProps) => (
-  <AntdThemeProvider>
-    <ProgressBar {...args} type="circle" />
-  </AntdThemeProvider>
+  <ProgressBar {...args} type="circle" />
 );
 
 export const InteractiveProgressDashboard = (args: ProgressBarProps) => (
-  <AntdThemeProvider>
-    <ProgressBar {...args} type="dashboard" />
-  </AntdThemeProvider>
+  <ProgressBar {...args} type="dashboard" />
 );
 
 const commonArgs = {
diff --git a/superset-frontend/src/components/Tags/Tag.stories.tsx b/superset-frontend/src/components/Tags/Tag.stories.tsx
index bcd29cd13..b6d82bff9 100644
--- a/superset-frontend/src/components/Tags/Tag.stories.tsx
+++ b/superset-frontend/src/components/Tags/Tag.stories.tsx
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { AntdThemeProvider } from 'src/components/AntdThemeProvider';
 import TagType from 'src/types/TagType';
 import { Tag } from '.';
 
@@ -24,11 +23,7 @@ export default {
   title: 'Tags',
   component: Tag,
 };
-export const InteractiveTag = (args: TagType) => (
-  <AntdThemeProvider>
-    <Tag {...args} />
-  </AntdThemeProvider>
-);
+export const InteractiveTag = (args: TagType) => <Tag {...args} />;
 
 InteractiveTag.args = {
   editable: false,
diff --git a/superset-frontend/src/components/Tags/TagsList.stories.tsx b/superset-frontend/src/components/Tags/TagsList.stories.tsx
index 3c9a19ef3..622ab155e 100644
--- a/superset-frontend/src/components/Tags/TagsList.stories.tsx
+++ b/superset-frontend/src/components/Tags/TagsList.stories.tsx
@@ -17,7 +17,6 @@
  * under the License.
  */
 import TagType from 'src/types/TagType';
-import { AntdThemeProvider } from 'src/components/AntdThemeProvider';
 import { TagsList } from '.';
 import { TagsListProps } from './TagsList';
 
@@ -31,9 +30,7 @@ export const InteractiveTagsList = ({
   editable,
   maxTags,
 }: TagsListProps) => (
-  <AntdThemeProvider>
-    <TagsList tags={tags} editable={editable} maxTags={maxTags} />
-  </AntdThemeProvider>
+  <TagsList tags={tags} editable={editable} maxTags={maxTags} />
 );
 
 const tags: TagType[] = [