diff --git a/cmd/xl-sets.go b/cmd/xl-sets.go
index 05ee14e25..4e0a5b26d 100644
--- a/cmd/xl-sets.go
+++ b/cmd/xl-sets.go
@@ -333,12 +333,15 @@ func newXLSets(ctx context.Context, endpoints Endpoints, storageDisks []StorageA
 	for i := 0; i < setCount; i++ {
 		s.xlDisks[i] = make([]StorageAPI, drivesPerSet)
 		s.xlLockers[i] = make([]dsync.NetLocker, drivesPerSet)
+	}
 
+	for i := 0; i < setCount; i++ {
 		var endpoints Endpoints
 		for j := 0; j < drivesPerSet; j++ {
 			endpoints = append(endpoints, s.endpoints[i*drivesPerSet+j])
 			// Rely on endpoints list to initialize, init lockers and available disks.
 			s.xlLockers[i][j] = newLockAPI(s.endpoints[i*drivesPerSet+j])
+
 			disk := storageDisks[i*drivesPerSet+j]
 			if disk == nil {
 				continue