diff --git a/device.mk b/device.mk
index 37ddb12..6ced49c 100644
--- a/device.mk
+++ b/device.mk
@@ -161,6 +161,9 @@ PRODUCT_SOONG_NAMESPACES += \
 PRODUCT_PACKAGES += \
     android.hardware.usb@1.0-service.basic
 
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
+    ro.adb.nonblocking_ffs=0
+
 # Vibrator
 PRODUCT_PACKAGES += \
     android.hardware.vibrator-service.rosemary
diff --git a/recovery/root/init.recovery.mt6785.rc b/recovery/root/init.recovery.mt6785.rc
index bd76096..21ad769 100644
--- a/recovery/root/init.recovery.mt6785.rc
+++ b/recovery/root/init.recovery.mt6785.rc
@@ -1,3 +1,4 @@
 on init
     setprop sys.usb.ffs.aio_compat 1
     setprop sys.usb.configfs 1
+    setprop persist.adb.nonblocking_ffs 0
diff --git a/rootdir/etc/init.mt6785.usb.rc b/rootdir/etc/init.mt6785.usb.rc
index 7343e0e..dd39f08 100644
--- a/rootdir/etc/init.mt6785.usb.rc
+++ b/rootdir/etc/init.mt6785.usb.rc
@@ -42,6 +42,7 @@ on post-fs
 on boot
     setprop sys.usb.configfs 1
     setprop sys.usb.ffs.aio_compat 1
+    setprop persist.adb.nonblocking_ffs 0
     setprop vendor.usb.controller "musb-hdrc"
     setprop vendor.usb.acm_cnt 0
     setprop vendor.usb.acm_port0 ""