diff --git a/hugolib/site.go b/hugolib/site.go
index 42e429e67..b4607387f 100644
--- a/hugolib/site.go
+++ b/hugolib/site.go
@@ -1511,12 +1511,19 @@ func (s *Site) resetBuildState() {
 
 	spc = newPageCache()
 
-	for _, p := range s.rawAllPages {
+	initPage := func(p *Page) {
 		p.subSections = Pages{}
 		p.parent = nil
 		p.scratch = maps.NewScratch()
 		p.mainPageOutput = nil
 	}
+
+	for _, p := range s.Pages {
+		initPage(p)
+	}
+	for _, p := range s.headlessPages {
+		initPage(p)
+	}
 }
 
 func (s *Site) kindFromSections(sections []string) string {