diff --git a/system.prop b/system.prop
index d9be0d3..fd427d5 100644
--- a/system.prop
+++ b/system.prop
@@ -15,3 +15,8 @@ vendor.gatekeeper.disable_spu=true
 
 # MTP
 vendor.usb.use_ffs_mtp=1
+
+# Storage
+external_storage.projid.enabled=1
+external_storage.casefold.enabled=1
+external_storage.sdcardfs.enabled=0
diff --git a/twrp_hiphi.mk b/twrp_hiphi.mk
index 9891b26..3b761d3 100644
--- a/twrp_hiphi.mk
+++ b/twrp_hiphi.mk
@@ -10,6 +10,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/base.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_keys.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/emulated_storage.mk)
 
 # Inherit some common TWRP stuff.
 $(call inherit-product, vendor/twrp/config/common.mk)