diff --git a/main.go b/main.go
index 474b70a..ddef5cc 100644
--- a/main.go
+++ b/main.go
@@ -116,7 +116,9 @@ func (c *customDNSProviderSolver) Present(ch *v1alpha1.ChallengeRequest) error {
 		return err
 	}
 
-	_zone := strings.TrimSuffix(ch.ResolvedFQDN, "."+domainName)
+	_zone := strings.TrimRight(ch.ResolvedFQDN, ".")
+	_zone = strings.TrimSuffix(_zone, domainName)
+	_zone = strings.TrimRight(_zone, ".")
 	_key := "\"" + ch.Key + "\""
 
 	err = dnsObj.AddRecord("TXT", _zone, _key, false, "")