diff --git a/drivers/mmc/host/cqhci.c b/drivers/mmc/host/cqhci.c
index c239ffa7629d..c8a856ebe410 100644
--- a/drivers/mmc/host/cqhci.c
+++ b/drivers/mmc/host/cqhci.c
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2020, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.
  */
 
 #include <linux/delay.h>
@@ -361,8 +361,10 @@ static int cqhci_enable(struct mmc_host *mmc, struct mmc_card *card)
 		return err;
 	}
 
-	if (cqhci_host_is_crypto_supported(cq_host))
+	if (cqhci_host_is_crypto_supported(cq_host)) {
 		cqhci_crypto_enable(cq_host);
+		cqhci_crypto_recovery_finish(cq_host);
+	}
 
 	__cqhci_enable(cq_host);
 
@@ -1168,7 +1170,6 @@ static void cqhci_recovery_finish(struct mmc_host *mmc)
 
 	cqhci_set_irqs(cq_host, CQHCI_IS_MASK);
 
-	cqhci_crypto_recovery_finish(cq_host);
 	pr_debug("%s: cqhci: recovery done\n", mmc_hostname(mmc));
 	mmc_log_string(mmc, "recovery done\n");
 }