diff --git a/packages/grafana-ui/.storybook/preview.ts b/packages/grafana-ui/.storybook/preview.ts
index d8a51bcd804..c4ac4691dcd 100644
--- a/packages/grafana-ui/.storybook/preview.ts
+++ b/packages/grafana-ui/.storybook/preview.ts
@@ -39,8 +39,8 @@ export const parameters = {
     container: ThemedDocsContainer,
   },
   darkMode: {
-    dark: GrafanaDark,
-    light: GrafanaLight,
+    dark: { ...GrafanaDark, base: 'dark' },
+    light: { ...GrafanaLight, base: 'light' },
   },
   layout: 'fullscreen',
   actions: { argTypesRegex: '^on[A-Z].*' },
diff --git a/packages/grafana-ui/.storybook/storybookTheme.ts b/packages/grafana-ui/.storybook/storybookTheme.ts
index e57efc4614b..36715f8d776 100644
--- a/packages/grafana-ui/.storybook/storybookTheme.ts
+++ b/packages/grafana-ui/.storybook/storybookTheme.ts
@@ -5,8 +5,6 @@ import '../src/components/Icon/iconBundle';
 
 const createStorybookTheme = (theme: GrafanaTheme2) => {
   return create({
-    base: theme.name.includes('Light') ? 'light' : 'dark',
-
     colorPrimary: theme.colors.primary.main,
     colorSecondary: theme.colors.error.main,