diff --git a/server/loader.go b/server/loader.go
index 8216ab9ee..e353c50d1 100644
--- a/server/loader.go
+++ b/server/loader.go
@@ -29,7 +29,11 @@ func (s *Server) addProject(ctx context.Context, project *types.Project) error {
 	for _, dataset := range project.Datasets {
 		for _, table := range dataset.Tables {
 			table.SetupMetadata(project.ID, dataset.ID)
-			if err := s.addTableData(ctx, tx, project, dataset, table); err != nil {
+			tableDef, err := types.NewTableWithSchema(table.ToBigqueryV2(project.ID, dataset.ID), table.Data)
+			if err != nil {
+				return err
+			}
+			if err := s.addTableData(ctx, tx, project, dataset, tableDef); err != nil {
 				return err
 			}
 		}
diff --git a/server/loader_internal_test.go b/server/loader_internal_test.go
new file mode 100644
index 000000000..1300f6e7d
--- /dev/null
+++ b/server/loader_internal_test.go
@@ -0,0 +1,68 @@
+package server
+
+import (
+	"context"
+	"testing"
+
+	"github.com/goccy/bigquery-emulator/internal/logger"
+	"github.com/goccy/bigquery-emulator/types"
+)
+
+func TestAddProjectNormalizesRepeatedRecordData(t *testing.T) {
+	s, err := New(TempStorage)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer s.Close()
+	ctx := logger.WithLogger(context.Background(), s.logger)
+
+	project := types.NewProject("test",
+		types.NewDataset("dataset",
+			types.NewTable("repro", []*types.Column{
+				types.NewColumn("items", types.RECORD,
+					types.ColumnMode(types.RepeatedMode),
+					types.ColumnFields(
+						types.NewColumn("id", types.INTEGER),
+						types.NewColumn("name", types.STRING),
+						types.NewColumn("skip", types.BOOLEAN),
+						types.NewColumn("enabled", types.BOOLEAN),
+					),
+				),
+			}, types.Data{{
+				"items": []map[string]interface{}{{"id": 1, "name": "item-1", "skip": false, "enabled": true}},
+			}}),
+		),
+	)
+	if err := s.addProject(ctx, project); err != nil {
+		t.Fatal(err)
+	}
+
+	conn, err := s.connMgr.Connection(ctx, "test", "dataset")
+	if err != nil {
+		t.Fatal(err)
+	}
+	tx, err := conn.Begin(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer tx.RollbackIfNotCommitted()
+
+	res, err := s.contentRepo.Query(ctx, tx, "test", "dataset", `
+SELECT item.id, item.name, item.skip, item.enabled
+FROM repro
+LEFT JOIN UNNEST(items) AS item
+`, nil)
+
+	if err != nil {
+		t.Fatal(err)
+	}
+	if res.TotalRows != 1 || len(res.Rows) != 1 || len(res.Rows[0].F) != 4 {
+		t.Fatalf("rows = %#v; want 1 row with 4 fields", res.Rows)
+	}
+	want := []string{"1", "item-1", "false", "true"}
+	for i, want := range want {
+		if got := res.Rows[0].F[i].V; got != want {
+			t.Errorf("field %d = %q; want %q", i, got, want)
+		}
+	}
+}