diff --git a/builder/azure/common/client/config.go b/builder/azure/common/client/config.go
index 96ca8c651..9a4a736e8 100644
--- a/builder/azure/common/client/config.go
+++ b/builder/azure/common/client/config.go
@@ -280,19 +280,19 @@ func (c *Config) FillParameters() error {
 		c.SubscriptionID = subscriptionID
 	}
 
-	if c.TenantID == "" {
-		tenantID, err := common.FindTenantID(*c.CloudEnvironment, c.SubscriptionID)
+	if c.CloudEnvironment == nil {
+		err := c.setCloudEnvironment()
 		if err != nil {
 			return err
 		}
-		c.TenantID = tenantID
 	}
 
-	if c.CloudEnvironment == nil {
-		err := c.setCloudEnvironment()
+	if c.TenantID == "" {
+		tenantID, err := findTenantID(*c.CloudEnvironment, c.SubscriptionID)
 		if err != nil {
 			return err
 		}
+		c.TenantID = tenantID
 	}
 
 	return nil