diff --git a/internal/compiler/resolve.go b/internal/compiler/resolve.go
index 9c2257ac99..8f5be2c3c4 100644
--- a/internal/compiler/resolve.go
+++ b/internal/compiler/resolve.go
@@ -334,9 +334,12 @@ func (comp *Compiler) resolveCatalogRefs(qc *QueryCatalog, rvs []*ast.RangeVar,
 
 				var paramName string
 				var paramType *ast.TypeName
+
 				if argName == "" {
-					paramName = fun.Args[i].Name
-					paramType = fun.Args[i].Type
+					if i < len(fun.Args) {
+						paramName = fun.Args[i].Name
+						paramType = fun.Args[i].Type
+					}
 				} else {
 					paramName = argName
 					for _, arg := range fun.Args {
@@ -351,6 +354,9 @@ func (comp *Compiler) resolveCatalogRefs(qc *QueryCatalog, rvs []*ast.RangeVar,
 				if paramName == "" {
 					paramName = funcName
 				}
+				if paramType == nil {
+					paramType = &ast.TypeName{Name: ""}
+				}
 
 				defaultP := named.NewInferredParam(paramName, true)
 				p, isNamed := params.FetchMerge(ref.ref.Number, defaultP)
diff --git a/internal/endtoend/testdata/func_variadic/postgresql/stdlib/go/db.go b/internal/endtoend/testdata/func_variadic/postgresql/stdlib/go/db.go
new file mode 100644
index 0000000000..22b44a018f
--- /dev/null
+++ b/internal/endtoend/testdata/func_variadic/postgresql/stdlib/go/db.go
@@ -0,0 +1,31 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.17.0
+
+package querytest
+
+import (
+	"context"
+	"database/sql"
+)
+
+type DBTX interface {
+	ExecContext(context.Context, string, ...interface{}) (sql.Result, error)
+	PrepareContext(context.Context, string) (*sql.Stmt, error)
+	QueryContext(context.Context, string, ...interface{}) (*sql.Rows, error)
+	QueryRowContext(context.Context, string, ...interface{}) *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/func_variadic/postgresql/stdlib/go/models.go b/internal/endtoend/testdata/func_variadic/postgresql/stdlib/go/models.go
new file mode 100644
index 0000000000..aa94e60b13
--- /dev/null
+++ b/internal/endtoend/testdata/func_variadic/postgresql/stdlib/go/models.go
@@ -0,0 +1,15 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.17.0
+
+package querytest
+
+import (
+	"database/sql"
+	"encoding/json"
+)
+
+type Test struct {
+	ID sql.NullInt32
+	J  json.RawMessage
+}
diff --git a/internal/endtoend/testdata/func_variadic/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/func_variadic/postgresql/stdlib/go/query.sql.go
new file mode 100644
index 0000000000..b49c5af199
--- /dev/null
+++ b/internal/endtoend/testdata/func_variadic/postgresql/stdlib/go/query.sql.go
@@ -0,0 +1,39 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.17.0
+// source: query.sql
+
+package querytest
+
+import (
+	"context"
+	"database/sql"
+)
+
+const updateJ = `-- name: UpdateJ :exec
+UPDATE
+    test
+SET
+    j = jsonb_build_object($1, $2, $3, $4)
+WHERE
+    id = $5
+`
+
+type UpdateJParams struct {
+	JsonbBuildObject   interface{}
+	JsonbBuildObject_2 interface{}
+	JsonbBuildObject_3 interface{}
+	JsonbBuildObject_4 interface{}
+	ID                 sql.NullInt32
+}
+
+func (q *Queries) UpdateJ(ctx context.Context, arg UpdateJParams) error {
+	_, err := q.db.ExecContext(ctx, updateJ,
+		arg.JsonbBuildObject,
+		arg.JsonbBuildObject_2,
+		arg.JsonbBuildObject_3,
+		arg.JsonbBuildObject_4,
+		arg.ID,
+	)
+	return err
+}
diff --git a/internal/endtoend/testdata/func_variadic/postgresql/stdlib/query.sql b/internal/endtoend/testdata/func_variadic/postgresql/stdlib/query.sql
new file mode 100644
index 0000000000..63298cb46d
--- /dev/null
+++ b/internal/endtoend/testdata/func_variadic/postgresql/stdlib/query.sql
@@ -0,0 +1,12 @@
+CREATE TABLE test (
+    id integer,
+    j jsonb NOT NULL
+    );
+
+-- name: UpdateJ :exec
+UPDATE
+    test
+SET
+    j = jsonb_build_object($1, $2, $3, $4)
+WHERE
+    id = $5;
\ No newline at end of file
diff --git a/internal/endtoend/testdata/func_variadic/postgresql/stdlib/sqlc.json b/internal/endtoend/testdata/func_variadic/postgresql/stdlib/sqlc.json
new file mode 100644
index 0000000000..c72b6132d5
--- /dev/null
+++ b/internal/endtoend/testdata/func_variadic/postgresql/stdlib/sqlc.json
@@ -0,0 +1,12 @@
+{
+  "version": "1",
+  "packages": [
+    {
+      "path": "go",
+      "engine": "postgresql",
+      "name": "querytest",
+      "schema": "query.sql",
+      "queries": "query.sql"
+    }
+  ]
+}
diff --git a/internal/sql/catalog/func.go b/internal/sql/catalog/func.go
index d2891b773c..0bbe5c6622 100644
--- a/internal/sql/catalog/func.go
+++ b/internal/sql/catalog/func.go
@@ -9,7 +9,7 @@ import (
 
 // Function describes a database function
 //
-// A database function is a method written to performs specific operation on data within the database.
+// A database function is a method written to perform a specific operation on data within the database.
 type Function struct {
 	Name               string
 	Args               []*Argument