diff --git a/db.go b/db.go
index 27171f0ac372019ab8d52e429cfa9213370589c3..eb561d8ddabc71288c74587309e65f33094a3d00 100644
--- a/db.go
+++ b/db.go
@@ -165,8 +165,9 @@ func (d *acmedb) handleDBUpgradeTo1() error {
 func (d *acmedb) NewTXTValuesInTransaction(tx *sql.Tx, subdomain string) error {
 	var err error
 	instr := fmt.Sprintf("INSERT INTO txt (Subdomain, LastUpdate) values('%s', 0)", subdomain)
-	_, _ = tx.Exec(instr)
-	_, _ = tx.Exec(instr)
+	for i := 0; i < Config.General.TxtRecordsCount; i++ {
+		_, _ = tx.Exec(instr)
+	}
 	return err
 }
 
@@ -253,7 +254,7 @@ func (d *acmedb) GetTXTForDomain(domain string) ([]string, error) {
 	domain = sanitizeString(domain)
 	var txts []string
 	getSQL := `
-	SELECT Value FROM txt WHERE Subdomain=$1 LIMIT 100
+	SELECT Value FROM txt WHERE Subdomain=$1 LIMIT $2
 	`
 	if Config.Database.Engine == "sqlite3" {
 		getSQL = getSQLiteStmt(getSQL)
@@ -264,7 +265,7 @@ func (d *acmedb) GetTXTForDomain(domain string) ([]string, error) {
 		return txts, err
 	}
 	defer sm.Close()
-	rows, err := sm.Query(domain)
+	rows, err := sm.Query(domain, Config.General.TxtRecordsCount)
 	if err != nil {
 		return txts, err
 	}