diff --git a/adb/daemon/usb.cpp b/adb/daemon/usb.cpp
index 69d1c3149..f0e286103 100644
--- a/adb/daemon/usb.cpp
+++ b/adb/daemon/usb.cpp
@@ -628,10 +628,9 @@ static void usb_ffs_open_thread() {
 }
 
 void usb_init() {
-    bool use_nonblocking = android::base::GetBoolProperty("persist.adb.nonblocking_ffs", true);
-    if (use_nonblocking) {
-        std::thread(usb_ffs_open_thread).detach();
-    } else {
+    if (!android::base::GetBoolProperty("persist.adb.nonblocking_ffs", false)) {
         usb_init_legacy();
+    } else {
+        std::thread(usb_ffs_open_thread).detach();
     }
 }