diff --git a/internal/codegen/golang/gen.go b/internal/codegen/golang/gen.go
index ac91cc537f..7df56a0a41 100644
--- a/internal/codegen/golang/gen.go
+++ b/internal/codegen/golang/gen.go
@@ -383,7 +383,7 @@ func filterUnusedStructs(enums []Enum, structs []Struct, queries []Query) ([]Enu
 			keepTypes[query.Ret.Type()] = struct{}{}
 			if query.Ret.IsStruct() {
 				for _, field := range query.Ret.Struct.Fields {
-					keepTypes[field.Type] = struct{}{}
+					keepTypes[strings.TrimPrefix(field.Type, "[]")] = struct{}{}
 					for _, embedField := range field.EmbedFields {
 						keepTypes[embedField.Type] = struct{}{}
 					}
diff --git a/internal/endtoend/testdata/omit_unused_structs/postgresql/stdlib/go/models.go b/internal/endtoend/testdata/omit_unused_structs/postgresql/stdlib/go/models.go
index cd6f5908a5..ea330414ff 100644
--- a/internal/endtoend/testdata/omit_unused_structs/postgresql/stdlib/go/models.go
+++ b/internal/endtoend/testdata/omit_unused_structs/postgresql/stdlib/go/models.go
@@ -9,6 +9,48 @@ import (
 	"fmt"
 )
 
+type ArrayEnum string
+
+const (
+	ArrayEnumO ArrayEnum = "o"
+	ArrayEnumP ArrayEnum = "p"
+)
+
+func (e *ArrayEnum) Scan(src interface{}) error {
+	switch s := src.(type) {
+	case []byte:
+		*e = ArrayEnum(s)
+	case string:
+		*e = ArrayEnum(s)
+	default:
+		return fmt.Errorf("unsupported scan type for ArrayEnum: %T", src)
+	}
+	return nil
+}
+
+type NullArrayEnum struct {
+	ArrayEnum ArrayEnum
+	Valid     bool // Valid is true if ArrayEnum is not NULL
+}
+
+// Scan implements the Scanner interface.
+func (ns *NullArrayEnum) Scan(value interface{}) error {
+	if value == nil {
+		ns.ArrayEnum, ns.Valid = "", false
+		return nil
+	}
+	ns.Valid = true
+	return ns.ArrayEnum.Scan(value)
+}
+
+// Value implements the driver Valuer interface.
+func (ns NullArrayEnum) Value() (driver.Value, error) {
+	if !ns.Valid {
+		return nil, nil
+	}
+	return string(ns.ArrayEnum), nil
+}
+
 type QueryParamEnumTableEnum string
 
 const (
@@ -261,6 +303,11 @@ func (ns NullQuerySqlcEmbedEnum) Value() (driver.Value, error) {
 	return string(ns.QuerySqlcEmbedEnum), nil
 }
 
+type ArrayEnumTable struct {
+	ID    int32
+	Value []ArrayEnum
+}
+
 type QueryParamEnumTable struct {
 	ID    int32
 	Other QueryParamEnumTableEnum
diff --git a/internal/endtoend/testdata/omit_unused_structs/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/omit_unused_structs/postgresql/stdlib/go/query.sql.go
index 6cb813b458..fb603f5480 100644
--- a/internal/endtoend/testdata/omit_unused_structs/postgresql/stdlib/go/query.sql.go
+++ b/internal/endtoend/testdata/omit_unused_structs/postgresql/stdlib/go/query.sql.go
@@ -8,8 +8,37 @@ package db
 import (
 	"context"
 	"database/sql"
+
+	"github.com/lib/pq"
 )
 
+const query_enum_array_table = `-- name: query_enum_array_table :many
+SELECT id, value FROM array_enum_table
+`
+
+func (q *Queries) query_enum_array_table(ctx context.Context) ([]ArrayEnumTable, error) {
+	rows, err := q.db.QueryContext(ctx, query_enum_array_table)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	var items []ArrayEnumTable
+	for rows.Next() {
+		var i ArrayEnumTable
+		if err := rows.Scan(&i.ID, pq.Array(&i.Value)); err != nil {
+			return nil, err
+		}
+		items = append(items, i)
+	}
+	if err := rows.Close(); err != nil {
+		return nil, err
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return items, nil
+}
+
 const query_param_enum_table = `-- name: query_param_enum_table :one
 SELECT id, other, value FROM query_param_enum_table WHERE value = $1
 `
diff --git a/internal/endtoend/testdata/omit_unused_structs/postgresql/stdlib/query.sql b/internal/endtoend/testdata/omit_unused_structs/postgresql/stdlib/query.sql
index 599a227482..60104c8e9d 100644
--- a/internal/endtoend/testdata/omit_unused_structs/postgresql/stdlib/query.sql
+++ b/internal/endtoend/testdata/omit_unused_structs/postgresql/stdlib/query.sql
@@ -15,3 +15,6 @@ SELECT value, another FROM query_return_struct_enum_table WHERE id = $1;
 
 -- name: query_sqlc_embed_table :one
 SELECT sqlc.embed(query_sqlc_embed_table) FROM query_sqlc_embed_table WHERE id = $1;
+
+-- name: query_enum_array_table :many
+SELECT * FROM array_enum_table;
diff --git a/internal/endtoend/testdata/omit_unused_structs/postgresql/stdlib/schema.sql b/internal/endtoend/testdata/omit_unused_structs/postgresql/stdlib/schema.sql
index 486119c334..4ce59218b6 100644
--- a/internal/endtoend/testdata/omit_unused_structs/postgresql/stdlib/schema.sql
+++ b/internal/endtoend/testdata/omit_unused_structs/postgresql/stdlib/schema.sql
@@ -58,4 +58,12 @@ CREATE TYPE query_sqlc_embed_enum AS ENUM (
 CREATE TABLE query_sqlc_embed_table (
     id      INTEGER PRIMARY KEY,
     value   query_sqlc_embed_enum
-)
+);
+
+CREATE TYPE array_enum AS ENUM (
+    'o', 'p'
+);
+CREATE TABLE array_enum_table (
+    id      INTEGER PRIMARY KEY,
+    value   array_enum[]
+);