diff --git a/commands/commandeer.go b/commands/commandeer.go
index 82d684153a5..1e5928ff97b 100644
--- a/commands/commandeer.go
+++ b/commands/commandeer.go
@@ -339,11 +339,10 @@ func (r *rootCommand) Run(ctx context.Context, cd *simplecobra.Commandeer, args
 		if r.buildWatch {
 			defer r.timeTrack(time.Now(), "Built")
 		}
-		close, err := b.build()
+		err := b.build()
 		if err != nil {
 			return err
 		}
-		close()
 		return nil
 	}()
 	if err != nil {
diff --git a/commands/hugobuilder.go b/commands/hugobuilder.go
index 6ae9640b08c..f5bc730873a 100644
--- a/commands/hugobuilder.go
+++ b/commands/hugobuilder.go
@@ -361,32 +361,34 @@ func (c *hugoBuilder) newWatcher(pollIntervalStr string, dirList ...string) (*wa
 	return watcher, nil
 }
 
-func (c *hugoBuilder) build() (func(), error) {
+func (c *hugoBuilder) build() error {
 	stopProfiling, err := c.initProfiling()
 	if err != nil {
-		return nil, err
+		return err
 	}
 
+	defer func() {
+		if stopProfiling != nil {
+			stopProfiling()
+		}
+	}()
+
 	if err := c.fullBuild(false); err != nil {
-		return nil, err
+		return err
 	}
 
 	if !c.r.quiet {
 		c.r.Println()
 		h, err := c.hugo()
 		if err != nil {
-			return nil, err
+			return err
 		}
 
 		h.PrintProcessingStats(os.Stdout)
 		c.r.Println()
 	}
 
-	return func() {
-		if stopProfiling != nil {
-			stopProfiling()
-		}
-	}, nil
+	return nil
 }
 
 func (c *hugoBuilder) buildSites(noBuildLock bool) (err error) {
diff --git a/commands/server.go b/commands/server.go
index e803d48249e..bdf6e905a26 100644
--- a/commands/server.go
+++ b/commands/server.go
@@ -495,19 +495,16 @@ func (c *serverCommand) Run(ctx context.Context, cd *simplecobra.Commandeer, arg
 
 	}
 
-	var close func()
 	err := func() error {
 		defer c.r.timeTrack(time.Now(), "Built")
 		var err error
-		close, err = c.build()
+		err = c.build()
 		return err
 	}()
 	if err != nil {
 		return err
 	}
 
-	defer close()
-
 	return c.serve()
 }