diff --git a/packages/shared-components/.storybook/preview.tsx b/packages/shared-components/.storybook/preview.tsx
index 0c423aedd9..91a6df646e 100644
--- a/packages/shared-components/.storybook/preview.tsx
+++ b/packages/shared-components/.storybook/preview.tsx
@@ -64,18 +64,24 @@ async function languageLoader(context: StoryContext<ReactRenderer, StrictArgs>):
 }
 
 const withTooltipProvider: Decorator = (Story) => {
+    return (
+        <TooltipProvider>
+            <Story />
+        </TooltipProvider>
+    );
+};
+
+const withI18nProvider: Decorator = (Story) => {
     return (
         <I18nContext.Provider value={new I18nApi()}>
-            <TooltipProvider>
-                <Story />
-            </TooltipProvider>
+            <Story />
         </I18nContext.Provider>
     );
 };
 
 const preview: Preview = {
     tags: ["autodocs"],
-    decorators: [withThemeProvider, withTooltipProvider],
+    decorators: [withThemeProvider, withTooltipProvider, withI18nProvider],
     parameters: {
         options: {
             storySort: {