diff --git a/internal/codegen/golang/query.go b/internal/codegen/golang/query.go
index 6bd9b70e25..9eb55e2a55 100644
--- a/internal/codegen/golang/query.go
+++ b/internal/codegen/golang/query.go
@@ -72,7 +72,8 @@ func (v QueryValue) Pairs() []Argument {
 	}
 	if !v.EmitStruct() && v.IsStruct() {
 		var out []Argument
-		for _, f := range v.Struct.Fields {
+		// A named parameter used more than once is one field, so one argument.
+		for _, f := range v.UniqueFields() {
 			out = append(out, Argument{
 				Name: escape(toLowerCase(f.Name)),
 				Type: f.Type,
diff --git a/internal/endtoend/testdata/query_parameter_limit_repeated_narg/mysql/go/db.go b/internal/endtoend/testdata/query_parameter_limit_repeated_narg/mysql/go/db.go
new file mode 100644
index 0000000000..32faa9f2b8
--- /dev/null
+++ b/internal/endtoend/testdata/query_parameter_limit_repeated_narg/mysql/go/db.go
@@ -0,0 +1,31 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.31.1
+
+package querytest
+
+import (
+	"context"
+	"database/sql"
+)
+
+type DBTX interface {
+	ExecContext(context.Context, string, ...any) (sql.Result, error)
+	PrepareContext(context.Context, string) (*sql.Stmt, error)
+	QueryContext(context.Context, string, ...any) (*sql.Rows, error)
+	QueryRowContext(context.Context, string, ...any) *sql.Row
+}
+
+func New(db DBTX) *Queries {
+	return &Queries{db: db}
+}
+
+type Queries struct {
+	db DBTX
+}
+
+func (q *Queries) WithTx(tx *sql.Tx) *Queries {
+	return &Queries{
+		db: tx,
+	}
+}
diff --git a/internal/endtoend/testdata/query_parameter_limit_repeated_narg/mysql/go/models.go b/internal/endtoend/testdata/query_parameter_limit_repeated_narg/mysql/go/models.go
new file mode 100644
index 0000000000..19389c1348
--- /dev/null
+++ b/internal/endtoend/testdata/query_parameter_limit_repeated_narg/mysql/go/models.go
@@ -0,0 +1,10 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.31.1
+
+package querytest
+
+type User struct {
+	Name string
+	Age  int32
+}
diff --git a/internal/endtoend/testdata/query_parameter_limit_repeated_narg/mysql/go/query.sql.go b/internal/endtoend/testdata/query_parameter_limit_repeated_narg/mysql/go/query.sql.go
new file mode 100644
index 0000000000..dd5253cec8
--- /dev/null
+++ b/internal/endtoend/testdata/query_parameter_limit_repeated_narg/mysql/go/query.sql.go
@@ -0,0 +1,38 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.31.1
+// source: query.sql
+
+package querytest
+
+import (
+	"context"
+	"database/sql"
+)
+
+const listUsers = `-- name: ListUsers :many
+SELECT name FROM users WHERE (name = ? OR ? IS NULL) AND age > ?
+`
+
+func (q *Queries) ListUsers(ctx context.Context, name sql.NullString, minAge int32) ([]string, error) {
+	rows, err := q.db.QueryContext(ctx, listUsers, name, name, minAge)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	var items []string
+	for rows.Next() {
+		var name string
+		if err := rows.Scan(&name); err != nil {
+			return nil, err
+		}
+		items = append(items, name)
+	}
+	if err := rows.Close(); err != nil {
+		return nil, err
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return items, nil
+}
diff --git a/internal/endtoend/testdata/query_parameter_limit_repeated_narg/mysql/query.sql b/internal/endtoend/testdata/query_parameter_limit_repeated_narg/mysql/query.sql
new file mode 100644
index 0000000000..fe1ac7f644
--- /dev/null
+++ b/internal/endtoend/testdata/query_parameter_limit_repeated_narg/mysql/query.sql
@@ -0,0 +1,2 @@
+-- name: ListUsers :many
+SELECT name FROM users WHERE (name = sqlc.narg(name) OR sqlc.narg(name) IS NULL) AND age > sqlc.arg(min_age);
diff --git a/internal/endtoend/testdata/query_parameter_limit_repeated_narg/mysql/schema.sql b/internal/endtoend/testdata/query_parameter_limit_repeated_narg/mysql/schema.sql
new file mode 100644
index 0000000000..673cda068b
--- /dev/null
+++ b/internal/endtoend/testdata/query_parameter_limit_repeated_narg/mysql/schema.sql
@@ -0,0 +1 @@
+CREATE TABLE users (name TEXT NOT NULL, age INT NOT NULL);
diff --git a/internal/endtoend/testdata/query_parameter_limit_repeated_narg/mysql/sqlc.json b/internal/endtoend/testdata/query_parameter_limit_repeated_narg/mysql/sqlc.json
new file mode 100644
index 0000000000..179fa5bd79
--- /dev/null
+++ b/internal/endtoend/testdata/query_parameter_limit_repeated_narg/mysql/sqlc.json
@@ -0,0 +1,13 @@
+{
+  "version": "1",
+  "packages": [
+    {
+      "path": "go",
+      "engine": "mysql",
+      "name": "querytest",
+      "schema": "schema.sql",
+      "queries": "query.sql",
+      "query_parameter_limit": 5
+    }
+  ]
+}