diff --git a/pkg/cluster/bootstrap.go b/pkg/cluster/bootstrap.go
index c579842647dd..76cc290cab70 100644
--- a/pkg/cluster/bootstrap.go
+++ b/pkg/cluster/bootstrap.go
@@ -243,7 +243,6 @@ RETRY:
 	}
 
 	files := make(bootstrap.PathsDataformat)
-
 	if err := json.NewDecoder(buf).Decode(&files); err != nil {
 		// This will fail if data is being pulled from old an cluster since
 		// older clusters used a map[string][]byte for the data structure.
@@ -254,6 +253,7 @@ RETRY:
 			return err
 		}
 	}
+	buf.Seek(0, 0)
 
 	type update struct {
 		db, disk, conflict bool
diff --git a/pkg/cluster/https.go b/pkg/cluster/https.go
index 285421d96a8d..c14588da7364 100644
--- a/pkg/cluster/https.go
+++ b/pkg/cluster/https.go
@@ -80,7 +80,8 @@ func (c *Cluster) initClusterAndHTTPS(ctx context.Context) error {
 
 	// Create a HTTP server with the registered request handlers, using logrus for logging
 	server := http.Server{
-		Handler: handler}
+		Handler: handler,
+	}
 
 	if logrus.IsLevelEnabled(logrus.DebugLevel) {
 		server.ErrorLog = log.New(logrus.StandardLogger().Writer(), "Cluster-Http-Server ", log.LstdFlags)