diff --git a/packages/vscode-extension/src/commonlib/codeFlowLogin.ts b/packages/vscode-extension/src/commonlib/codeFlowLogin.ts
index de1b27fc8c1..ece8bd3df50 100644
--- a/packages/vscode-extension/src/commonlib/codeFlowLogin.ts
+++ b/packages/vscode-extension/src/commonlib/codeFlowLogin.ts
@@ -267,7 +267,7 @@ export class CodeFlowLogin {
           [TelemetryProperty.UserId]: (tokenJson as any).oid ? (tokenJson as any).oid : "",
           [TelemetryProperty.Internal]: (
             (tokenJson as any).upn ?? (tokenJson as any).unique_name
-          ).endsWith("@microsoft.com")
+          )?.endsWith("@microsoft.com")
             ? "true"
             : "false",
         });
@@ -350,7 +350,7 @@ export class CodeFlowLogin {
           [TelemetryProperty.UserId]: (tokenJson as any).oid ? (tokenJson as any).oid : "",
           [TelemetryProperty.Internal]: (
             (tokenJson as any).upn ?? (tokenJson as any).unique_name
-          ).endsWith("@microsoft.com")
+          )?.endsWith("@microsoft.com")
             ? "true"
             : "false",
         });