diff --git a/apps/meteor/client/meteor/startup/accounts.ts b/apps/meteor/client/meteor/startup/accounts.ts
index 3fbb07686fcd9..bdd29ebe7844e 100644
--- a/apps/meteor/client/meteor/startup/accounts.ts
+++ b/apps/meteor/client/meteor/startup/accounts.ts
@@ -5,12 +5,12 @@ import { sdk } from '../../../app/utils/client/lib/SDKClient';
 import { t } from '../../../app/utils/lib/i18n';
 import { PublicSettingsCachedStore, SubscriptionsCachedStore } from '../../cachedStores';
 import { dispatchToastMessage } from '../../lib/toast';
-import { userIdStore } from '../../lib/user';
+import { getUserId, userIdStore } from '../../lib/user';
 import { useUserDataSyncReady } from '../../lib/userData';
 
 const whenMainReady = (): Promise<void> => {
 	const isMainReady = (): boolean => {
-		const uid = userIdStore.getState();
+		const uid = getUserId();
 		if (!uid) return true;
 
 		const subscriptionsReady = SubscriptionsCachedStore.useReady.getState();
diff --git a/apps/meteor/client/providers/UserProvider/UserProvider.tsx b/apps/meteor/client/providers/UserProvider/UserProvider.tsx
index 5b641d50da0c8..38a370284f33f 100644
--- a/apps/meteor/client/providers/UserProvider/UserProvider.tsx
+++ b/apps/meteor/client/providers/UserProvider/UserProvider.tsx
@@ -24,7 +24,7 @@ import { useIdleConnection } from '../../hooks/useIdleConnection';
 import type { IDocumentMapStore } from '../../lib/cachedStores/DocumentMapStore';
 import { applyQueryOptions } from '../../lib/cachedStores/applyQueryOptions';
 import { createReactiveSubscriptionFactory } from '../../lib/createReactiveSubscriptionFactory';
-import { userIdStore } from '../../lib/user';
+import { getUser, userIdStore } from '../../lib/user';
 import { Users, Rooms, Subscriptions } from '../../stores';
 import { useSamlInviteToken } from '../../views/invite/hooks/useSamlInviteToken';
 
@@ -36,9 +36,7 @@ const ee = new Emitter();
 Accounts.onLogout(() => ee.emit('logout'));
 
 ee.on('logout', async () => {
-	const userId = userIdStore.getState();
-	if (!userId) return;
-	const user = Users.state.get(userId);
+	const user = getUser();
 	if (!user) return;
 
 	await afterLogoutCleanUpCallback.run(user);
diff --git a/apps/meteor/client/startup/startup.ts b/apps/meteor/client/startup/startup.ts
index 652b85045f19a..4e37343964bfc 100644
--- a/apps/meteor/client/startup/startup.ts
+++ b/apps/meteor/client/startup/startup.ts
@@ -3,11 +3,11 @@ import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 import moment from 'moment';
 
-import 'highlight.js/styles/github.css';
 import { sdk } from '../../app/utils/client/lib/SDKClient';
 import { synchronizeUserData, removeLocalUserData } from '../lib/userData';
 import { fireGlobalEvent } from '../lib/utils/fireGlobalEvent';
 import { watchUserId } from '../meteor/user';
+import 'highlight.js/styles/github.css';
 
 Meteor.startup(() => {
 	fireGlobalEvent('startup', true);