diff --git a/apps/frontend/src/app.vue b/apps/frontend/src/app.vue
index f0a1006e4a..3741d3f102 100644
--- a/apps/frontend/src/app.vue
+++ b/apps/frontend/src/app.vue
@@ -33,7 +33,7 @@ import {
 import { useAuth } from './composables/auth'
 
 const auth = await useAuth()
-const userPreferences = setupProviders(auth)
+const { userPreferences } = setupProviders(auth)
 const cosmetics = useCosmetics()
 const theme = useTheme()
 const { locale, setLocale } = injectI18n()
diff --git a/apps/frontend/src/error.vue b/apps/frontend/src/error.vue
index c168f55f40..578547c0fe 100644
--- a/apps/frontend/src/error.vue
+++ b/apps/frontend/src/error.vue
@@ -110,7 +110,6 @@ import {
 	commonMessages,
 	defineMessage,
 	defineMessages,
-	injectNotificationManager,
 	IntlFormatted,
 	LoadingBar,
 	normalizeChildren,
@@ -131,10 +130,9 @@ import { getSignInRouteObj } from '~/composables/auth.js'
 import { setupProviders } from '~/providers/setup.ts'
 
 const auth = await useAuth()
-setupProviders(auth)
+const { notificationManager } = setupProviders(auth)
 
 const { formatMessage } = useVIntl()
-const { addNotification } = injectNotificationManager()
 const isSwitchingAccount = useIsSwitchingAccount()
 
 const props = defineProps({
@@ -180,7 +178,7 @@ async function signOut() {
 async function onSelectStoredAccount(account) {
 	const result = await switchToStoredAccount(account)
 	if (result === 'error') {
-		addNotification({
+		notificationManager.addNotification({
 			title: formatMessage(commonMessages.errorNotificationTitle),
 			text: formatMessage(unauthorizedMessages.accountSwitchFailed),
 			type: 'error',
diff --git a/apps/frontend/src/providers/setup.ts b/apps/frontend/src/providers/setup.ts
index eb969312dc..503e43804e 100644
--- a/apps/frontend/src/providers/setup.ts
+++ b/apps/frontend/src/providers/setup.ts
@@ -28,5 +28,5 @@ export function setupProviders(auth: Awaited<ReturnType<typeof useAuth>>) {
 	setupLoadingStateProvider()
 	setupUserCountryProvider()
 
-	return userPreferences
+	return { notificationManager, userPreferences }
 }