diff --git a/frontend/src/context/AuthContext.tsx b/frontend/src/context/AuthContext.tsx
index d36678e..dd2a408 100644
--- a/frontend/src/context/AuthContext.tsx
+++ b/frontend/src/context/AuthContext.tsx
@@ -12,12 +12,19 @@ import { authAPI } from '../services/api';
 // Check if Azure AD is configured
 const isAzureConfigured =
   process.env.REACT_APP_AZURE_CLIENT_ID &&
-  process.env.REACT_APP_AZURE_CLIENT_ID !== 'your-client-id-here';
+  process.env.REACT_APP_AZURE_CLIENT_ID !== 'your-client-id-here' &&
+  process.env.REACT_APP_AZURE_TENANT_ID &&
+  process.env.REACT_APP_AZURE_TENANT_ID !== 'your-tenant-id-here';
 
 // Initialize MSAL instance only if Azure is configured
-const msalInstance = isAzureConfigured
-  ? new PublicClientApplication(msalConfig)
-  : null;
+let msalInstance: PublicClientApplication | null = null;
+if (isAzureConfigured) {
+  try {
+    msalInstance = new PublicClientApplication(msalConfig);
+  } catch (error) {
+    console.warn('Failed to initialize MSAL. Azure AD not properly configured:', error);
+  }
+}
 
 interface User {
   id: string;