diff --git a/system.prop b/system.prop
index 048ecba8e..fa2a5c9ed 100644
--- a/system.prop
+++ b/system.prop
@@ -46,3 +46,6 @@ bluetooth.profile.pan.nap.enabled?=true
 bluetooth.profile.pan.panu.enabled?=true
 bluetooth.profile.pbap.server.enabled?=true
 bluetooth.profile.sap.server.enabled?=true
+
+# Samsung vendors default to a Samsung-specific gadget for MTP. Set this to use AOSP's functionfs MTP
+vendor.usb.use_ffs_mtp=1