diff --git a/frontend/src/components/App/InitialRouteHandler.tsx b/frontend/src/components/App/InitialRouteHandler.tsx
index 33bf3324..aa64e1f8 100644
--- a/frontend/src/components/App/InitialRouteHandler.tsx
+++ b/frontend/src/components/App/InitialRouteHandler.tsx
@@ -117,6 +117,13 @@ const InitialRouteHandler: React.FC = () => {
   }
 
   const isDemoMode = shouldSkipOnboarding();
+  console.log('InitialRouteHandler DEBUG:', {
+    isDemoMode,
+    isOnboardingComplete,
+    subscription: subscription ? { plan: subscription.plan, active: subscription.active } : null,
+    loading,
+    data: !!data
+  });
   const isActiveSubscriber = Boolean(subscription && subscription.active && subscription.plan !== 'none');
   const waitingForOnboardingInit = !isDemoMode && isActiveSubscriber && (loading || !data);
   if (waitingForOnboardingInit) {
diff --git a/frontend/src/utils/demoMode.ts b/frontend/src/utils/demoMode.ts
index cd24ce09..e725ff5c 100644
--- a/frontend/src/utils/demoMode.ts
+++ b/frontend/src/utils/demoMode.ts
@@ -16,6 +16,7 @@ export function getEnabledFeatures(): Set<string> {
   // Check localStorage first
   const storageValue = localStorage.getItem(PRIMARY_STORAGE_KEY);
   if (storageValue) {
+    console.log('demoMode: Found in localStorage:', storageValue);
     const features = storageValue.toLowerCase().split(',').map(f => f.trim());
     if (features.includes('all')) {
       return new Set(['all']);
@@ -25,6 +26,7 @@ export function getEnabledFeatures(): Set<string> {
 
   // Check environment variable
   const envValue = process.env[PRIMARY_ENV_KEY];
+  console.log('demoMode: ENV value for', PRIMARY_ENV_KEY, ':', envValue);
   if (envValue) {
     const features = envValue.toLowerCase().split(',').map(f => f.trim());
     if (features.includes('all')) {
@@ -34,6 +36,7 @@ export function getEnabledFeatures(): Set<string> {
   }
 
   // Default: all features enabled
+  console.log('demoMode: No env var, returning default "all"');
   return new Set(['all']);
 }