diff --git a/data.cpp b/data.cpp
index f19a2ed4..7661d69e 100755
--- a/data.cpp
+++ b/data.cpp
@@ -779,6 +779,7 @@ void DataManager::SetDefaultValues()
 	mData.SetValue(TW_IS_ENCRYPTED, "0");
 	mData.SetValue(TW_IS_DECRYPTED, "0");
 	mData.SetValue(TW_CRYPTO_PASSWORD, "0");
+	mData.SetValue(TW_CRYPTO_PWTYPE, "0"); // Set initial value so that recovery will not be confused when using unencrypted data or failed to decrypt data
 	mData.SetValue("tw_terminal_state", "0");
 	mData.SetValue("tw_background_thread_running", "0");
 	mData.SetValue(TW_RESTORE_FILE_DATE, "0");
diff --git a/partition.cpp b/partition.cpp
index 71af8490..3b85a8c2 100755
--- a/partition.cpp
+++ b/partition.cpp
@@ -736,7 +736,6 @@ void TWPartition::Set_FBE_Status() {
 bool TWPartition::Decrypt_FBE_DE() {
 	if (TWFunc::Path_Exists("/data/unencrypted/key/version")) {
 		DataManager::SetValue(TW_IS_FBE, 1);
-		DataManager::SetValue(TW_CRYPTO_PWTYPE, "0"); // Set initial value so that recovery will not be confused when using unencrypted data or failed to decrypt data
 		PartitionManager.Set_Crypto_State();
 		PartitionManager.Set_Crypto_Type("file");
 		LOGINFO("File Based Encryption is present\n");