diff --git a/gui/theme/common/languages/en.xml b/gui/theme/common/languages/en.xml
index 35b2bbe4..811f40c4 100755
--- a/gui/theme/common/languages/en.xml
+++ b/gui/theme/common/languages/en.xml
@@ -744,11 +744,11 @@
 		<string name="flash_ab_both_slots">Flash to both slots</string>
 		<string name="ozip_decrypt_decryption">Starting Ozip Decryption...</string>
 		<string name="ozip_decrypt_finish">Ozip Decryption Finished!</string>
-		<string name="fbe_wipe_msg">WARNING: {1} wiped. FBE device should be booted into Android and not Recovery to set initial FBE policy after wipe.</string>
 		<string name="fastboot_button">Fastboot</string>
 		<string name="enable_adb">Enable ADB</string>
 		<string name="enable_fastboot">Enable Fastboot</string>
 		<string name="fastboot_console_msg">Entered Fastboot mode...</string>
+		<string name="data_media_fbe_msg">TWRP will not recreate /data/media on an FBE device. Please reboot into your rom to create /data/media</string>
 		<!-- Android Rescue Party trigger -->
 		<string name="rescue_party0">Android Rescue Party trigger! Possible solutions? Either:</string>
 		<string name="rescue_party1"> 1. Wipe caches, and/or</string>
diff --git a/gui/theme/common/languages/id.xml b/gui/theme/common/languages/id.xml
index d2069789..ecbe7ff4 100755
--- a/gui/theme/common/languages/id.xml
+++ b/gui/theme/common/languages/id.xml
@@ -743,7 +743,6 @@
 		<string name="flash_ab_both_slots">Flash ke kedua slot</string>
 		<string name="ozip_decrypt_decryption">Mulai mendekripsi Ozip ...</string>
 		<string name="ozip_decrypt_finish">Mendeskripsi Ozip selesai!</string>
-		<string name="fbe_wipe_msg">PERINGATAN: {1} dihapus. Perangkat FBE harus di-boot ke Android dan bukan Recovery untuk mengatur kebijakan FBE awal setelah penghapusan.</string>
 		<string name="fastboot_button">Fastboot</string>
 		<string name="enable_adb">Aktifkan ADB</string>
 		<string name="enable_fastboot">Aktifkan Fastboot</string>
diff --git a/gui/theme/common/languages/nl.xml b/gui/theme/common/languages/nl.xml
index a913d9da..efd84e75 100644
--- a/gui/theme/common/languages/nl.xml
+++ b/gui/theme/common/languages/nl.xml
@@ -737,7 +737,6 @@
 		<string name="flash_ab_both_slots">Beide slots flashen</string>
 		<string name="ozip_decrypt_decryption">Ozip-ontsleutelen...</string>
 		<string name="ozip_decrypt_finish">Ozip-ontsleutelen gereed!</string>
-		<string name="fbe_wipe_msg">WAARSCHUWING: {1} gewist. FBE-apparaat dient opgestart te worden in Android, niet Recovery, om initieel FBE-beleid in werking te zetten na het wissen.</string>
 		<string name="fastboot_button">Fastboot</string>
 		<string name="enable_adb">ADB inschakelen</string>
 		<string name="enable_fastboot">Fastboot inschakelen</string>
diff --git a/gui/theme/extra-languages/languages/zh_CN.xml b/gui/theme/extra-languages/languages/zh_CN.xml
index eea8525d..40128bc2 100644
--- a/gui/theme/extra-languages/languages/zh_CN.xml
+++ b/gui/theme/extra-languages/languages/zh_CN.xml
@@ -740,7 +740,6 @@
 		<string name="flash_ab_reboot">如需刷入其它的 Zip 刷机包，请重启 Recovery 切换到新槽位。</string>
 		<string name="ozip_decrypt_decryption">正在解密 Ozip…</string>
 		<string name="ozip_decrypt_finish">Ozip 解密完成！</string>
-		<string name="fbe_wipe_msg">警告: {1} 已清除。FBE 设备应启动至 Android 系统而不是 Recovery，才能初始化 FBE 策略。</string>
 		<string name="fastboot_button">Fastboot</string>
 		<string name="enable_adb">启用 ADB</string>
 		<string name="enable_fastboot">启用 Fastboot</string>
diff --git a/gui/theme/extra-languages/languages/zh_TW.xml b/gui/theme/extra-languages/languages/zh_TW.xml
index b73a68d5..74ebfb97 100644
--- a/gui/theme/extra-languages/languages/zh_TW.xml
+++ b/gui/theme/extra-languages/languages/zh_TW.xml
@@ -740,7 +740,6 @@
 		<string name="flash_ab_reboot">如需刷入其它的 Zip 刷機包，請重新啓動 Recovery 切換到新槽位。</string>
 		<string name="ozip_decrypt_decryption">正在解密 Ozip…</string>
 		<string name="ozip_decrypt_finish">Ozip 解密完成！</string>
-		<string name="fbe_wipe_msg">注意: {1} 已清除。FBE 設備應啟動至 Android 而不是 Recovery，才能初始化 FBE 策略。</string>
 		<string name="fastboot_button">Fastboot</string>
 		<string name="enable_adb">啓用 ADB</string>
 		<string name="enable_fastboot">啓用 Fastboot</string>
diff --git a/partition.cpp b/partition.cpp
index 54522a91..293e95b8 100755
--- a/partition.cpp
+++ b/partition.cpp
@@ -2074,6 +2074,10 @@ bool TWPartition::Wipe_Encryption() {
 #ifndef TW_OEM_BUILD
 		gui_msg("format_data_msg=You may need to reboot recovery to be able to use /data again.");
 #endif
+		if (Is_FBE) {
+			gui_msg(Msg(msg::kWarning, "data_media_fbe_msg=TWRP will not recreate /data/media on an FBE device. Please reboot into your rom to create /data/media."));
+		}
+
 		ret = true;
 		if (!Key_Directory.empty())
 			ret = PartitionManager.Wipe_By_Path(Key_Directory);