diff --git a/.storybook/preview.tsx b/.storybook/preview.tsx
index cb6e99dec600..5c469f94a12f 100644
--- a/.storybook/preview.tsx
+++ b/.storybook/preview.tsx
@@ -39,6 +39,12 @@ import { writingModeStyles } from './writing_mode.styles';
 // once all EUI components are converted to Emotion
 import '../dist/eui_theme_light.css';
 
+/**
+ * Ensure that any provider errors throw & warn us early
+ */
+import { setEuiDevProviderWarning } from '../src/services';
+setEuiDevProviderWarning('error');
+
 /**
  * Prop controls
  */
@@ -51,7 +57,7 @@ const preview: Preview = {
     (Story, context) => (
       <EuiProvider
         colorMode={context.globals.colorMode}
-        {...(context.componentId === 'euiprovider' && context.args)}
+        {...(context.componentId === 'theming-euiprovider' && context.args)}
       >
         <div
           css={[