diff --git a/BoardConfig.mk b/BoardConfig.mk
index f35645d..274c915 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -130,7 +130,7 @@ PLATFORM_VERSION := 12.1.0
 TW_INCLUDE_CRYPTO := true
 TW_INCLUDE_CRYPTO_FBE := true
 BOARD_USES_QCOM_FBE_DECRYPTION := false
-TW_INCLUDE_FBE_METADATA_DECRYPT := false
+TW_INCLUDE_FBE_METADATA_DECRYPT := true
 BOARD_USES_METADATA_PARTITION := true
 
 # PRODUCT_COPY_FILES directives.
diff --git a/recovery/root/init.recovery.qcom.rc b/recovery/root/init.recovery.qcom.rc
index 9c31fc3..07ed8aa 100644
--- a/recovery/root/init.recovery.qcom.rc
+++ b/recovery/root/init.recovery.qcom.rc
@@ -28,6 +28,7 @@
 import /init.recovery.qcom_decrypt.rc
 
 on init
+    setprop twrp.defer.decrypt true
     # to cut charging battery path
     write /sys/class/power_supply/battery/siop_level 0
     setprop prepdecrypt.setpatch true