diff --git a/cmd/admin-handlers.go b/cmd/admin-handlers.go
index d55923275..347689578 100644
--- a/cmd/admin-handlers.go
+++ b/cmd/admin-handlers.go
@@ -838,15 +838,19 @@ func (adminAPI adminAPIHandlers) HealFormatHandler(w http.ResponseWriter, r *htt
 		return
 	}
 
+	// Wrap into retrying disks
+	retryingDisks := initRetryableStorageDisks(bootstrapDisks,
+		time.Millisecond, time.Millisecond*5)
+
 	// Heal format.json on available storage.
-	err = healFormatXL(bootstrapDisks)
+	err = healFormatXL(retryingDisks)
 	if err != nil {
 		writeErrorResponse(w, toAPIErrorCode(err), r.URL)
 		return
 	}
 
 	// Instantiate new object layer with newly formatted storage.
-	newObjectAPI, err := newXLObjects(bootstrapDisks)
+	newObjectAPI, err := newXLObjects(retryingDisks)
 	if err != nil {
 		writeErrorResponse(w, toAPIErrorCode(err), r.URL)
 		return
diff --git a/cmd/prepare-storage.go b/cmd/prepare-storage.go
index 91b750f46..b4e247a89 100644
--- a/cmd/prepare-storage.go
+++ b/cmd/prepare-storage.go
@@ -317,6 +317,22 @@ func initStorageDisks(endpoints EndpointList) ([]StorageAPI, error) {
 	return storageDisks, nil
 }
 
+// Wrap disks into retryable disks.
+func initRetryableStorageDisks(disks []StorageAPI, retryUnit, retryCap time.Duration) (outDisks []StorageAPI) {
+	// Initialize the disk into a retryable-disks wrapper.
+	outDisks = make([]StorageAPI, len(disks))
+	for i, disk := range disks {
+		outDisks[i] = &retryStorage{
+			remoteStorage:    disk,
+			maxRetryAttempts: globalStorageRetryThreshold,
+			retryUnit:        retryUnit,
+			retryCap:         retryCap,
+			offlineTimestamp: UTCNow(), // Set timestamp to prevent immediate marking as offline
+		}
+	}
+	return
+}
+
 // Format disks before initialization of object layer.
 func waitForFormatXLDisks(firstDisk bool, endpoints EndpointList, storageDisks []StorageAPI) (formattedDisks []StorageAPI, err error) {
 	if len(endpoints) == 0 {
@@ -327,39 +343,22 @@ func waitForFormatXLDisks(firstDisk bool, endpoints EndpointList, storageDisks [
 	}
 
 	// Retryable disks before formatting, we need to have a larger
-	// retry window so that we wait enough amount of time before
-	// the disks come online.
-	retryDisks := make([]StorageAPI, len(storageDisks))
-	for i, storage := range storageDisks {
-		retryDisks[i] = &retryStorage{
-			remoteStorage:    storage,
-			maxRetryAttempts: globalStorageInitRetryThreshold,
-			retryUnit:        time.Second,
-			retryCap:         time.Second * 30, // 30 seconds.
-			offlineTimestamp: UTCNow(),
-		}
-	}
-
-	// Start retry loop retrying until disks are formatted properly, until we have reached
-	// a conditional quorum of formatted disks.
+	// retry window (30 seconds, with once-per-second retries) so
+	// that we wait enough amount of time before the disks come
+	// online.
+	retryDisks := initRetryableStorageDisks(storageDisks, time.Second, time.Second*30)
+
+	// Start retry loop retrying until disks are formatted
+	// properly, until we have reached a conditional quorum of
+	// formatted disks.
 	err = retryFormattingXLDisks(firstDisk, endpoints, retryDisks)
 	if err != nil {
 		return nil, err
 	}
 
-	// Initialize the disk into a formatted disks wrapper.
-	formattedDisks = make([]StorageAPI, len(storageDisks))
-	for i, storage := range storageDisks {
-		// After formatting is done we need a smaller time
-		// window and lower retry value before formatting.
-		formattedDisks[i] = &retryStorage{
-			remoteStorage:    storage,
-			maxRetryAttempts: globalStorageRetryThreshold,
-			retryUnit:        time.Millisecond,
-			retryCap:         time.Millisecond * 5, // 5 milliseconds.
-			offlineTimestamp: UTCNow(),             // Set timestamp to prevent immediate marking as offline
-		}
-	}
+	// Initialize the disk into a formatted disks wrapper. This
+	// uses a shorter retry window (5ms with once-per-ms retries)
+	formattedDisks = initRetryableStorageDisks(storageDisks, time.Millisecond, time.Millisecond*5)
 
 	// Success.
 	return formattedDisks, nil