diff --git a/Tasks/AzureCLIV2/azureclitask.ts b/Tasks/AzureCLIV2/azureclitask.ts
index 1b69e236a64d..6bf9daea27ee 100644
--- a/Tasks/AzureCLIV2/azureclitask.ts
+++ b/Tasks/AzureCLIV2/azureclitask.ts
@@ -56,8 +56,8 @@ export class azureclitask {
             if (versionCommand) {
                 azVersionResult = tl.execSync("az", "version");
 
-                if (azVersionResult.code !== 0 || azVersionResult.stderr) {
-                    tl.debug("az version failed, falling back to 'az --version'");
+                if (azVersionResult.code !== 0 || azVersionResult.stderr || !azVersionResult.stdout || azVersionResult.stdout.trim() === '') {
+                    tl.debug("az version failed or returned empty output, falling back to 'az --version'");
                     azVersionResult = tl.execSync("az", "--version");
                 }
             }