diff --git a/src/components/OAuthWrapper.tsx b/src/components/OAuthWrapper.tsx
index e375e64..e66065c 100644
--- a/src/components/OAuthWrapper.tsx
+++ b/src/components/OAuthWrapper.tsx
@@ -13,8 +13,15 @@ export function OAuthWrapper({ children }: React.PropsWithChildren<{}>) {
   const running = useGetAccessToken()
   const $state = useLoadedContext(SideBarStateContext)
 
+  const firstRenderRef = React.useRef(true)
   React.useEffect(() => {
-    $state.onChange(running ? 'getting-access-token' : 'after-getting-access-token')
+    if (running) {
+      $state.onChange('getting-access-token')
+    } else if (firstRenderRef.current) {
+      firstRenderRef.current = false
+    } else {
+      $state.onChange('after-getting-access-token')
+    }
   }, [running])
 
   // block children rendering on the first render if setting token