diff --git a/buildscripts/verify-healing.sh b/buildscripts/verify-healing.sh
index 21bb894c7..5643ace41 100755
--- a/buildscripts/verify-healing.sh
+++ b/buildscripts/verify-healing.sh
@@ -67,7 +67,7 @@ function start_minio_3_node() {
 
 
 function check_online() {
-    if grep -q 'Server switching to safe mode' ${WORK_DIR}/dist-minio-*.log; then
+    if grep -q 'Unable to initialize sub-systems' ${WORK_DIR}/dist-minio-*.log; then
         echo "1"
     fi
 }
diff --git a/cmd/admin-heal-ops.go b/cmd/admin-heal-ops.go
index c7a0ffcbf..2e1c2e5be 100644
--- a/cmd/admin-heal-ops.go
+++ b/cmd/admin-heal-ops.go
@@ -819,16 +819,6 @@ func (h *healSequence) healFromSourceCh() {
 }
 
 func (h *healSequence) healDiskMeta(objAPI ObjectLayer) error {
-	// Try to pro-actively heal backend-encrypted file.
-	if err := h.queueHealTask(healSource{
-		bucket: minioMetaBucket,
-		object: backendEncryptedFile,
-	}, madmin.HealItemBucketMetadata); err != nil {
-		if !isErrObjectNotFound(err) && !isErrVersionNotFound(err) {
-			return err
-		}
-	}
-
 	// Start healing the config prefix.
 	return h.healMinioSysMeta(objAPI, minioConfigPrefix)()
 }
diff --git a/cmd/config-encrypted.go b/cmd/config-encrypted.go
index 81ecaa692..2d2b81670 100644
--- a/cmd/config-encrypted.go
+++ b/cmd/config-encrypted.go
@@ -183,5 +183,5 @@ func migrateConfigPrefixToEncrypted(objAPI ObjectLayer, encrypted bool) error {
 	if encrypted && GlobalKMS != nil {
 		logger.Info("Migration of encrypted config data completed. All config data is now encrypted.")
 	}
-	return deleteConfig(GlobalContext, globalObjectAPI, backendEncryptedFile)
+	return deleteConfig(GlobalContext, objAPI, backendEncryptedFile)
 }
diff --git a/cmd/global-heal.go b/cmd/global-heal.go
index d49ef780a..3326347b0 100644
--- a/cmd/global-heal.go
+++ b/cmd/global-heal.go
@@ -158,13 +158,6 @@ func (er *erasureObjects) healErasureSet(ctx context.Context, buckets []BucketIn
 		Name: pathJoin(minioMetaBucket, minioConfigPrefix),
 	})
 
-	// Try to pro-actively heal backend-encrypted file.
-	if _, err := er.HealObject(ctx, minioMetaBucket, backendEncryptedFile, "", madmin.HealOpts{}); err != nil {
-		if !isErrObjectNotFound(err) && !isErrVersionNotFound(err) {
-			logger.LogIf(ctx, err)
-		}
-	}
-
 	// Heal all buckets with all objects
 	for _, bucket := range buckets {
 		if tracker.isHealed(bucket.Name) {