diff --git a/cmd/bootstrap-messages.go b/cmd/bootstrap-messages.go
index f8f6d0459..4d2cb110b 100644
--- a/cmd/bootstrap-messages.go
+++ b/cmd/bootstrap-messages.go
@@ -62,8 +62,8 @@ func (bs *bootstrapTracer) Empty() bool {
 	return empty
 }
 
-func (bs *bootstrapTracer) Record(msg string) {
-	source := getSource(2)
+func (bs *bootstrapTracer) Record(msg string, skip int) {
+	source := getSource(skip + 1)
 	bs.mu.Lock()
 	now := time.Now().UTC()
 	bs.info[bs.idx] = bootstrapInfo{
diff --git a/cmd/bootstrap-messages_test.go b/cmd/bootstrap-messages_test.go
index 2aa47e756..dbe2c59ce 100644
--- a/cmd/bootstrap-messages_test.go
+++ b/cmd/bootstrap-messages_test.go
@@ -28,7 +28,7 @@ func TestBootstrap(t *testing.T) {
 	// Bootstrap events exceed bootstrap messages limit
 	bsTracer := &bootstrapTracer{}
 	for i := 0; i < bootstrapMsgsLimit+10; i++ {
-		bsTracer.Record(fmt.Sprintf("msg-%d", i))
+		bsTracer.Record(fmt.Sprintf("msg-%d", i), 1)
 	}
 
 	traceInfos := bsTracer.Events()
@@ -45,7 +45,7 @@ func TestBootstrap(t *testing.T) {
 
 	// Fewer than 4K bootstrap events
 	for i := 0; i < 10; i++ {
-		bsTracer.Record(fmt.Sprintf("msg-%d", i))
+		bsTracer.Record(fmt.Sprintf("msg-%d", i), 1)
 	}
 	events := bsTracer.Events()
 	if len(events) != 10 {
diff --git a/cmd/server-main.go b/cmd/server-main.go
index 46f598f04..4222c69bb 100644
--- a/cmd/server-main.go
+++ b/cmd/server-main.go
@@ -352,7 +352,7 @@ func configRetriableErrors(err error) bool {
 }
 
 func bootstrapTrace(msg string) {
-	globalBootstrapTracer.Record(msg)
+	globalBootstrapTracer.Record(msg, 2)
 
 	if globalTrace.NumSubscribers(madmin.TraceBootstrap) == 0 {
 		return