diff --git a/apps/vite/src/main.tsx b/apps/vite/src/main.tsx
index 318f382c..e52e12b6 100644
--- a/apps/vite/src/main.tsx
+++ b/apps/vite/src/main.tsx
@@ -6,6 +6,7 @@ import '@tamagui/font-inter/css/700.css'
 
 import React from 'react'
 
+import { Provider } from '@status-im/components'
 import { createRoot } from 'react-dom/client'
 
 import App from './app'
@@ -14,6 +15,8 @@ const root = document.getElementById('root') as HTMLElement
 
 createRoot(root).render(
   <React.StrictMode>
-    <App />
+    <Provider>
+      <App />
+    </Provider>
   </React.StrictMode>
 )
diff --git a/packages/components/.storybook/preview.tsx b/packages/components/.storybook/preview.tsx
index 7056e3e4..8e419500 100644
--- a/packages/components/.storybook/preview.tsx
+++ b/packages/components/.storybook/preview.tsx
@@ -1,6 +1,5 @@
 import React from 'react'
-import { TamaguiProvider } from '@tamagui/core'
-import { config } from '../src'
+import { Provider } from '../src'
 import { Parameters, Decorator } from '@storybook/react'
 
 import './reset.css'
@@ -17,9 +16,9 @@ export const parameters: Parameters = {
 
 const withThemeProvider: Decorator = (Story, _context) => {
   return (
-    <TamaguiProvider config={config}>
+    <Provider>
       <Story />
-    </TamaguiProvider>
+    </Provider>
   )
 }
 export const decorators = [withThemeProvider]