diff --git a/front/src/index.tsx b/front/src/index.tsx
index d7a8362c28..8bbd593870 100644
--- a/front/src/index.tsx
+++ b/front/src/index.tsx
@@ -26,18 +26,18 @@ root.render(
   <RecoilRoot>
     <BrowserRouter>
       <ApolloProvider>
-        <UserProvider>
-          <ClientConfigProvider>
+        <ClientConfigProvider>
+          <UserProvider>
+            <AuthAutoRouter />
             <AppThemeProvider>
               <SnackBarProvider>
-                <AuthAutoRouter />
                 <StrictMode>
                   <App />
                 </StrictMode>
               </SnackBarProvider>
             </AppThemeProvider>
-          </ClientConfigProvider>
-        </UserProvider>
+          </UserProvider>
+        </ClientConfigProvider>
       </ApolloProvider>
     </BrowserRouter>
   </RecoilRoot>,
diff --git a/front/src/modules/activities/timeline/components/TimelineActivity.tsx b/front/src/modules/activities/timeline/components/TimelineActivity.tsx
index 201ada3594..1f7a738c7b 100644
--- a/front/src/modules/activities/timeline/components/TimelineActivity.tsx
+++ b/front/src/modules/activities/timeline/components/TimelineActivity.tsx
@@ -154,7 +154,7 @@ export function TimelineActivity({ commentThread }: OwnProps) {
         </StyledIconContainer>
         <StyledItemTitleContainer>
           <span>{commentThread.author.displayName}</span>
-          created a note
+          created a {commentThread.type.toLowerCase()}
         </StyledItemTitleContainer>
         <StyledItemTitleDate id={`id-${commentThread.id}`}>
           {beautifiedCreatedAt} ago
diff --git a/front/src/modules/apollo/hooks/useApolloFactory.ts b/front/src/modules/apollo/hooks/useApolloFactory.ts
index c7a6562d28..4eb0d6b9d3 100644
--- a/front/src/modules/apollo/hooks/useApolloFactory.ts
+++ b/front/src/modules/apollo/hooks/useApolloFactory.ts
@@ -7,6 +7,7 @@ import { tokenPairState } from '@/auth/states/tokenPairState';
 import { isDebugModeState } from '@/client-config/states/isDebugModeState';
 import { AppPath } from '@/types/AppPath';
 import { CommentThreadTarget } from '~/generated/graphql';
+import { useIsMatchingLocation } from '~/hooks/useIsMatchingLocation';
 import { useUpdateEffect } from '~/hooks/useUpdateEffect';
 
 import { ApolloFactory } from '../services/apollo.factory';
@@ -16,6 +17,7 @@ export function useApolloFactory() {
   const [isDebugMode] = useRecoilState(isDebugModeState);
 
   const navigate = useNavigate();
+  const isMatchingLocation = useIsMatchingLocation();
   const [tokenPair, setTokenPair] = useRecoilState(tokenPairState);
 
   const apolloClient = useMemo(() => {
@@ -49,7 +51,14 @@ export function useApolloFactory() {
       },
       onUnauthenticatedError() {
         setTokenPair(null);
-        navigate(AppPath.SignIn);
+        if (
+          !isMatchingLocation(AppPath.Verify) &&
+          !isMatchingLocation(AppPath.SignIn) &&
+          !isMatchingLocation(AppPath.SignUp) &&
+          !isMatchingLocation(AppPath.Invite)
+        ) {
+          navigate(AppPath.SignIn);
+        }
       },
       extraLinks: [],
       isDebugMode,