diff --git a/src/agent/accounts/usage.ts b/src/agent/accounts/usage.ts
index c919039..97e80c9 100644
--- a/src/agent/accounts/usage.ts
+++ b/src/agent/accounts/usage.ts
@@ -64,11 +64,11 @@ function readCredentials(configDir: string): OAuthCredentials | null {
     const raw = readFileSync(credPath, 'utf-8');
     const parsed = JSON.parse(raw);
     const oauth = parsed.claudeAiOauth;
-    if (!oauth || !oauth.accessToken || !oauth.refreshToken) return null;
+    if (!oauth || !oauth.accessToken) return null;
     return {
       accessToken: oauth.accessToken,
-      refreshToken: oauth.refreshToken,
-      expiresAt: oauth.expiresAt,
+      refreshToken: oauth.refreshToken ?? null,
+      expiresAt: oauth.expiresAt ?? null,
       subscriptionType: oauth.subscriptionType ?? null,
       rateLimitTier: oauth.rateLimitTier ?? null,
     };
@@ -78,6 +78,7 @@ function readCredentials(configDir: string): OAuthCredentials | null {
 }
 
 function isTokenExpired(credentials: OAuthCredentials): boolean {
+  if (!credentials.expiresAt) return false; // Setup tokens without expiry are treated as non-expired
   return credentials.expiresAt < Date.now() + TOKEN_REFRESH_BUFFER_MS;
 }