diff --git a/pkg/issuer/acme/dns/azuredns/azuredns.go b/pkg/issuer/acme/dns/azuredns/azuredns.go
index def805340..4f00a63f2 100644
--- a/pkg/issuer/acme/dns/azuredns/azuredns.go
+++ b/pkg/issuer/acme/dns/azuredns/azuredns.go
@@ -95,7 +95,7 @@ func (c *DNSProvider) CleanUp(domain, fqdn, value string) error {
 		context.TODO(),
 		c.resourceGroupName,
 		z,
-		c.trimFqdn(fqdn),
+		c.trimFqdn(fqdn, z),
 		dns.TXT, "")
 
 	if err != nil {
@@ -124,12 +124,12 @@ func (c *DNSProvider) createRecord(fqdn, value string, ttl int) error {
 		context.TODO(),
 		c.resourceGroupName,
 		z,
-		c.trimFqdn(fqdn),
+		c.trimFqdn(fqdn, z),
 		dns.TXT,
 		*rparams, "", "")
 
 	if err != nil {
-		klog.Infof("Error creating TXT: %s, %v", c.zoneName, err)
+		klog.Infof("Error creating TXT: %s, %v", z, err)
 		return err
 	}
 	return nil
@@ -157,6 +157,11 @@ func (c *DNSProvider) getHostedZoneName(fqdn string) (string, error) {
 	return util.UnFqdn(z), nil
 }
 
-func (c *DNSProvider) trimFqdn(fqdn string) string {
-	return strings.TrimSuffix(strings.TrimSuffix(fqdn, "."), "."+c.zoneName)
+// Trims DNS zone from the fqdn. Defaults to DNSProvider.zoneName if it is specified.
+func (c *DNSProvider) trimFqdn(fqdn string, zone string) string {
+	z := zone
+	if len(c.zoneName) > 0 {
+		z = c.zoneName
+	}
+	return strings.TrimSuffix(strings.TrimSuffix(fqdn, "."), "."+z)
 }