diff --git a/src/components/App.tsx b/src/components/App.tsx
index dfc2be5d..d04fef14 100644
--- a/src/components/App.tsx
+++ b/src/components/App.tsx
@@ -42,6 +42,7 @@ import { SearchPage } from '../pages/search.page'
 import { TopicPage } from '../pages/topic.page'
 import { ROUTES, useRouter } from '../stores/router'
 import { hideModal, MODALS, showModal } from '../stores/ui'
+import { InboxProvider } from '../context/inbox'
 
 // TODO: lazy load
 // const SomePage = lazy(() => import('./Pages/SomePage'))
@@ -124,7 +125,9 @@ export const App = (props: Props) => {
                 <ConnectProvider>
                   <NotificationsProvider>
                     <EditorProvider>
-                      <Dynamic component={pageComponent()} {...props} />
+                      <InboxProvider>
+                        <Dynamic component={pageComponent()} {...props} />
+                      </InboxProvider>
                     </EditorProvider>
                   </NotificationsProvider>
                 </ConnectProvider>
diff --git a/src/pages/inbox.page.tsx b/src/pages/inbox.page.tsx
index 5b9a9b42..7bde26df 100644
--- a/src/pages/inbox.page.tsx
+++ b/src/pages/inbox.page.tsx
@@ -5,7 +5,6 @@ import { createSignal, onMount } from 'solid-js'
 import { PageLayout } from '../components/_shared/PageLayout'
 import { ShowOnlyOnClient } from '../components/_shared/ShowOnlyOnClient'
 import { InboxView } from '../components/Views/Inbox/Inbox'
-import { InboxProvider } from '../context/inbox'
 import { useLocalize } from '../context/localize'
 import { loadAllAuthors } from '../stores/zine/authors'
 
@@ -24,9 +23,7 @@ export const InboxPage = (props: PageProps) => {
   return (
     <PageLayout hideFooter={true} title={t('Inbox')}>
       <ShowOnlyOnClient>
-        <InboxProvider>
-          <InboxView isLoaded={isLoaded()} authors={props.allAuthors} />
-        </InboxProvider>
+        <InboxView isLoaded={isLoaded()} authors={props.allAuthors} />
       </ShowOnlyOnClient>
     </PageLayout>
   )