diff --git a/src/pages/[eventAbbr]/ui/admin/check_in_event/index.tsx b/src/pages/[eventAbbr]/ui/admin/check_in_event/index.tsx
index 9d29511c..b7d5ed94 100644
--- a/src/pages/[eventAbbr]/ui/admin/check_in_event/index.tsx
+++ b/src/pages/[eventAbbr]/ui/admin/check_in_event/index.tsx
@@ -3,7 +3,6 @@ import React, { useMemo } from 'react'
 import { Layout } from '../../../../../components/Layout'
 import { useGetApiV1EventsByEventAbbrQuery } from '../../../../../generated/dreamkast-api.generated'
 import { useRouter } from 'next/router'
-import { withAuthProvider } from '../../../../../context/auth'
 import Error404 from '../../../../404'
 import { CheckIn } from '../../../../../components/CheckIn/CheckIn'
 import { Typography } from '@material-ui/core'
@@ -11,7 +10,7 @@ import { useSelector } from 'react-redux'
 import { authSelector } from '../../../../../store/auth'
 
 const IndexPage: NextPage = () => {
-  return withAuthProvider(<IndexMain />)
+  return <IndexMain />
 }
 
 const IndexMain = () => {
diff --git a/src/pages/[eventAbbr]/ui/admin/check_in_session/index.tsx b/src/pages/[eventAbbr]/ui/admin/check_in_session/index.tsx
index 4b382f68..b03ac90d 100644
--- a/src/pages/[eventAbbr]/ui/admin/check_in_session/index.tsx
+++ b/src/pages/[eventAbbr]/ui/admin/check_in_session/index.tsx
@@ -7,7 +7,6 @@ import {
   useGetApiV1TalksQuery,
 } from '../../../../../generated/dreamkast-api.generated'
 import { useRouter } from 'next/router'
-import { withAuthProvider } from '../../../../../context/auth'
 import Error404 from '../../../../404'
 import { CheckIn } from '../../../../../components/CheckIn/CheckIn'
 import { MenuItem, Select, Typography } from '@material-ui/core'
@@ -15,7 +14,7 @@ import { authSelector } from '../../../../../store/auth'
 import { useSelector } from 'react-redux'
 
 const IndexPage: NextPage = () => {
-  return withAuthProvider(<IndexMain />)
+  return <IndexMain />
 }
 
 const IndexMain = () => {
diff --git a/src/pages/[eventAbbr]/ui/index.tsx b/src/pages/[eventAbbr]/ui/index.tsx
index 73103abd..5b8d53f1 100644
--- a/src/pages/[eventAbbr]/ui/index.tsx
+++ b/src/pages/[eventAbbr]/ui/index.tsx
@@ -6,7 +6,6 @@ import { NextPage } from 'next'
 import { useInitSetup } from '../../../components/hooks/useInitSetup'
 import { useGetTalksAndTracks } from '../../../components/hooks/useGetTalksAndTracks'
 import { useRouterQuery } from '../../../components/hooks/useRouterQuery'
-import { withAuthProvider } from '../../../context/auth'
 import { NextTalkNotifier } from '../../../components/Layout/NextTalkNotifier'
 import { ENV } from '../../../config'
 import { useRouter } from 'next/router'
@@ -16,7 +15,7 @@ import { TrackLTView } from '../../../components/TrackLT'
 import { showLTSelector } from '../../../store/settings'
 
 const IndexPage: NextPage = () => {
-  return withAuthProvider(<IndexMain />)
+  return <IndexMain />
 }
 
 const IndexMain = () => {
@@ -90,7 +89,7 @@ const IndexMain = () => {
   )
 }
 
-// TODO move to RootApp component
+// TODO remove this ( seems not needed )
 export const getServerSideProps = async () => {
   return {
     props: {
diff --git a/src/pages/[eventAbbr]/ui/info/index.tsx b/src/pages/[eventAbbr]/ui/info/index.tsx
index 5f5929c3..4517ada9 100644
--- a/src/pages/[eventAbbr]/ui/info/index.tsx
+++ b/src/pages/[eventAbbr]/ui/info/index.tsx
@@ -11,10 +11,9 @@ import { Layout } from '../../../../components/Layout'
 import { RegisteredTalks } from '../../../../components/RegisteredTalks'
 import { Typography } from '@material-ui/core'
 import { ENV } from '../../../../config'
-import { withAuthProvider } from '../../../../context/auth'
 
 const IndexPage: NextPage = () => {
-  return withAuthProvider(<IndexMain />)
+  return <IndexMain />
 }
 
 const IndexMain: NextPage = () => {
diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
index 26437307..df133100 100644
--- a/src/pages/_app.tsx
+++ b/src/pages/_app.tsx
@@ -19,6 +19,7 @@ import { setApiBaseUrl, setDkUrl, setWsBaseUrl } from '../store/auth'
 import { ENV, validateEnv } from '../config'
 import { PrivateCtxProvider } from '../context/private'
 import { ApolloClient, InMemoryCache, ApolloProvider } from '@apollo/client'
+import { AuthProvider } from 'src/context/auth'
 
 const GlobalStyle = createGlobalStyle`
   html, body {
@@ -84,7 +85,9 @@ const RootApp = ({ Component, pageProps, env }: RootAppProps) => {
       <PrivateCtxProvider env={env}>
         <AppComponent>
           <ApolloProvider client={client}>
-            <Component {...pageProps} />
+            <AuthProvider>
+              <Component {...pageProps} />
+            </AuthProvider>
           </ApolloProvider>
         </AppComponent>
       </PrivateCtxProvider>