diff --git a/packages/react-component-library/.storybook/main.js b/packages/react-component-library/.storybook/main.js
index ec06a41b8d..f75747de41 100644
--- a/packages/react-component-library/.storybook/main.js
+++ b/packages/react-component-library/.storybook/main.js
@@ -20,4 +20,7 @@ module.exports = {
     ${process.env.NETLIFY ? newRelic.script : ''}
   `,
   stories: ['../src/**/*.stories.tsx'],
+  reactOptions: {
+    strictMode: process.env.REACT_STRICT_MODE === '1',
+  },
 }
diff --git a/packages/react-component-library/.storybook/preview.js b/packages/react-component-library/.storybook/preview.js
index d8bd1b5971..2ed015107f 100644
--- a/packages/react-component-library/.storybook/preview.js
+++ b/packages/react-component-library/.storybook/preview.js
@@ -58,11 +58,6 @@ export const parameters = {
 }
 
 export const decorators = [
-  (Story) => (
-    <React.StrictMode>
-      <GlobalStyleProvider>
-        <Story />
-      </GlobalStyleProvider>
-    </React.StrictMode>
-  ),
+  // https://github.com/storybookjs/storybook/issues/15223#issuecomment-1092837912
+  (Story) => <GlobalStyleProvider>{Story()}</GlobalStyleProvider>,
 ]