diff --git a/src/agent/accounts/usage.ts b/src/agent/accounts/usage.ts
index fd8a696..577c0e8 100644
--- a/src/agent/accounts/usage.ts
+++ b/src/agent/accounts/usage.ts
@@ -222,7 +222,7 @@ export async function checkAccountHealth(
   try {
     // Use credential manager if provided, otherwise fall back to direct functions
     let accessToken: string;
-    let currentExpiresAt: number;
+    let currentExpiresAt: number | null;
     let subscriptionType: string | null = null;
 
     if (credentialManager) {
@@ -293,7 +293,7 @@ export async function checkAccountHealth(
       ...base,
       credentialsValid: true,
       tokenValid: true,
-      tokenExpiresAt: new Date(currentExpiresAt).toISOString(),
+      tokenExpiresAt: currentExpiresAt ? new Date(currentExpiresAt).toISOString() : null,
       subscriptionType,
       usage,
     };