diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index 8814cd9..d4b2028 100755
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -112,6 +112,14 @@
 #endif
 }
 
+int TWPartitionManager::Set_FDE_Encrypt_Status(void) {
+	property_set("ro.crypto.state", "encrypted");
+	property_set("ro.crypto.type", "block");
+	// Sleep for a bit so that services can start if needed
+	sleep(1);
+	return 0;
+}
+
 int TWPartitionManager::Process_Fstab(string Fstab_Filename, bool Display_Error, bool Sar_Detect) {
 	FILE *fstabFile;
 	char fstab_line[MAX_FSTAB_LINE_LENGTH];
@@ -339,6 +347,7 @@
 				}
 			}
 		} else {
+			Set_FDE_Encrypt_Status();
 			int password_type = cryptfs_get_password_type();
 			if (password_type == CRYPT_TYPE_DEFAULT) {
 				LOGINFO("Device is encrypted with the default password, attempting to decrypt.\n");
@@ -1795,10 +1804,7 @@
 
 	property_get("ro.crypto.state", crypto_state, "error");
 	if (strcmp(crypto_state, "error") == 0) {
-		property_set("ro.crypto.state", "encrypted");
-		property_set("ro.crypto.type", "block");
-		// Sleep for a bit so that services can start if needed
-		sleep(1);
+		Set_FDE_Encrypt_Status();
 	}
 
 	if (DataManager::GetIntValue(TW_IS_FBE)) {
diff --git a/partitions.hpp b/partitions.hpp
index 6b9f375..564004e 100755
--- a/partitions.hpp
+++ b/partitions.hpp
@@ -391,6 +391,7 @@
 	bool Prepare_Repack(const std::string& Source_Path, const std::string& Temp_Folder_Destination, const bool Copy_Source, const bool Create_Destination = true); // Prepares an image for repacking by unpacking it to the temp folder destination
 	bool Repack_Images(const std::string& Target_Image, const struct Repack_Options_struct& Repack_Options); // Repacks the boot image with a new kernel or a new ramdisk
 	std::vector<users_struct>* Get_Users_List();                              // Returns pointer to list of users
+	int Set_FDE_Encrypt_Status();                                             // Sets encryption state for FDE devices (ro.crypto.state and ro.crypto.type)
 
 private:
 	void Setup_Settings_Storage_Partition(TWPartition* Part);                 // Sets up settings storage