diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index f8cf22c1..3c03c70f 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -13,6 +13,7 @@ import { SSEProvider } from './contexts/SSEContext';
 import { SubscriptionEventsProvider } from './contexts/SubscriptionEventsContext';
 import GlobalSubscriptionHandler from './components/auth/GlobalSubscriptionHandler';
 import { CookieBanner } from './components/ui/CookieConsent';
+import { useTenantInitializer } from './stores/useTenantInitializer';
 import i18n from './i18n';
 
 const queryClient = new QueryClient({
@@ -29,6 +30,9 @@ const queryClient = new QueryClient({
 function AppContent() {
   const navigate = useNavigate();
 
+  // Initialize tenant data when user is authenticated or in demo mode
+  useTenantInitializer();
+
   return (
     <>
       <Suspense fallback={<LoadingSpinner overlay />}>