diff --git a/providers/sitebuilder/builder.go b/providers/sitebuilder/builder.go
index f18e00d..7523d13 100644
--- a/providers/sitebuilder/builder.go
+++ b/providers/sitebuilder/builder.go
@@ -572,6 +572,9 @@ func (b *Builder) writeUploads(ctx buildContext, uploads []models.Upload) error
 }
 
 func (b *Builder) writeStaticAssets(ctx buildContext) error {
+	if b.opts.StaticFS == nil {
+		return nil
+	}
 	return fs.WalkDir(b.opts.StaticFS, ".", func(path string, d os.DirEntry, err error) error {
 		if err != nil {
 			return err
diff --git a/services/sites/services.go b/services/sites/services.go
index 4c974bb..86e34b2 100644
--- a/services/sites/services.go
+++ b/services/sites/services.go
@@ -77,11 +77,12 @@ func (s *Service) FirstRun(ctx context.Context, req FirstRunRequest) (newUser mo
 	}
 
 	newSite = models.Site{
-		Title:    defaultIfEmpty(req.SiteName, "New Site"),
-		GUID:     models.NewNanoID(),
-		OwnerID:  newUser.ID,
-		Timezone: "UTC",
-		Created:  time.Now(),
+		Title:        defaultIfEmpty(req.SiteName, "New Site"),
+		GUID:         models.NewNanoID(),
+		OwnerID:      newUser.ID,
+		Timezone:     "UTC",
+		PostsPerPage: 10,
+		Created:      time.Now(),
 	}
 	if err := s.db.SaveSite(ctx, &newSite); err != nil {
 		return newUser, newSite, err