diff --git a/packages/pl-fe/src/features/ui/index.tsx b/packages/pl-fe/src/features/ui/index.tsx index 46fc1ccc6..0786bf3f9 100644 --- a/packages/pl-fe/src/features/ui/index.tsx +++ b/packages/pl-fe/src/features/ui/index.tsx @@ -388,6 +388,7 @@ const UI: React.FC = React.memo(({ children }) => { const features = useFeatures(); const vapidKey = useAppSelector(state => getVapidKey(state)); const client = useClient(); + const instance = useInstance(); const { isDropdownMenuOpen } = useUiStore(); const standalone = useAppSelector(isStandalone); @@ -477,8 +478,8 @@ const UI: React.FC = React.memo(({ children }) => { // The user has logged in useEffect(() => { - loadAccountData(); - }, [!!account]); + if (instance.fetched) loadAccountData(); + }, [!!account, instance.fetched]); useEffect(() => { dispatch(registerPushNotifications());